Skip to content

Commit 87e7a33

Browse files
committed
🥚 🎡 release 0.5.6. fix #33, #32
1 parent a8bbf35 commit 87e7a33

16 files changed

+67
-39
lines changed

.travis.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,30 @@ python:
1313
stages:
1414
- test
1515
- lint
16+
17+
.disable_global: &disable_global
18+
before_install: false
19+
install: true
20+
before_script: false
21+
after_success: false
22+
after_failure: false
23+
24+
.lint: &lint
25+
<<: *disable_global
26+
python: 3.6
27+
stage: lint
28+
install: pip install flake8
29+
script: flake8
30+
1631
jobs:
1732
include:
18-
- stage: lint
19-
python: 3.6
20-
script: make lint
33+
- *lint
2134

2235
stage: test
2336

2437
script: make test
2538

2639
before_install:
27-
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
2840
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
2941
mv min_requirements.txt requirements.txt ;
3042
fi

CHANGELOG.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Change log
22
================================================================================
33

4+
0.5.6 - 19.03.2019
5+
--------------------------------------------------------------------------------
6+
7+
added
8+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9+
10+
#. `#32 <https://github.com/pyexcel/pyexcel-ods/issues/32>`_, fix odfpy pinning
11+
#. `#33 <https://github.com/pyexcel/pyexcel-ods/issues/33>`_, fix
12+
IntegerAccuracyLossError on i586
13+
414
0.5.5 - 16.03.2019
515
--------------------------------------------------------------------------------
616

changelog.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: pyexcel-ods
22
organisation: pyexcel
33
releases:
4+
- changes:
5+
- action: added
6+
details:
7+
- '`#32`, fix odfpy pinning'
8+
- '`#33`, fix IntegerAccuracyLossError on i586'
9+
date: 19.03.2019
10+
version: 0.5.6
411
- changes:
512
- action: added
613
details:

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
copyright = 'copyright 2015-2019 Onni Software Ltd.'
2626
author = 'Onni Software Ltd.'
2727
# The short X.Y version
28-
version = '0.5.5'
28+
version = '0.5.6'
2929
# The full version, including alpha/beta/rc tags
30-
release = '0.5.5'
30+
release = '0.5.6'
3131

3232
# -- General configuration ---------------------------------------------------
3333

pyexcel-ods.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-ods"
33
nick_name: ods
4-
version: 0.5.5
5-
current_version: 0.5.5
6-
release: 0.5.5
4+
version: 0.5.6
5+
current_version: 0.5.6
6+
release: 0.5.6
77
copyright_year: 2015-2019
88
file_type: ods
99
dependencies:
10-
- pyexcel-io>=0.5.10
11-
- odfpy==1.3.5
10+
- pyexcel-io>=0.5.16
11+
- odfpy>=1.3.5
1212
description: A wrapper library to read, manipulate and write data in ods format

pyexcel_ods/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
:copyright: (c) 2015-2017 by Onni Software Ltd & its contributors
66
:license: New BSD License
77
"""
8+
89
# flake8: noqa
10+
from pyexcel_io.io import get_data as read_data
11+
from pyexcel_io.io import isstream
12+
from pyexcel_io.io import store_data as write_data
13+
914
# this line has to be place above all else
1015
# because of dynamic import
1116
from pyexcel_io.plugins import IOPluginInfoChain
12-
from pyexcel_io.io import (
13-
get_data as read_data,
14-
isstream,
15-
store_data as write_data,
16-
)
1717

1818
__FILE_TYPE__ = "ods"
1919
IOPluginInfoChain(__name__).add_a_reader(

pyexcel_ods/odsr.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222
# limitations under the License.
2323

2424
import pyexcel_io.service as service
25+
from pyexcel_io._compact import OrderedDict
26+
from pyexcel_io.book import BookReader
27+
from pyexcel_io.sheet import SheetReader
28+
2529
from odf.namespaces import OFFICENS
2630
from odf.opendocument import load
2731
from odf.table import Table, TableCell, TableRow
2832

2933
# Thanks to grt for the fixes
3034
from odf.teletype import extractText
3135
from odf.text import P
32-
from pyexcel_io._compact import OrderedDict
33-
from pyexcel_io.book import BookReader
34-
from pyexcel_io.sheet import SheetReader
3536

3637

3738
class ODSSheet(SheetReader):

pyexcel_ods/odsw.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
import sys
1111

1212
import pyexcel_io.service as converter
13+
from pyexcel_io.book import BookWriter
14+
from pyexcel_io.sheet import SheetWriter
15+
1316
from odf.namespaces import OFFICENS
1417
from odf.opendocument import OpenDocumentSpreadsheet
1518
from odf.table import Table, TableCell, TableRow
1619
from odf.text import P
17-
from pyexcel_io.book import BookWriter
18-
from pyexcel_io.sheet import SheetWriter
1920

2021
PY2 = sys.version_info[0] == 2
2122

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pyexcel-io>=0.5.10
2-
odfpy==1.3.5
1+
pyexcel-io>=0.5.16
2+
odfpy>=1.3.5

setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525

2626
NAME = 'pyexcel-ods'
2727
AUTHOR = 'C.W.'
28-
VERSION = '0.5.5'
28+
VERSION = '0.5.6'
2929
3030
LICENSE = 'New BSD'
3131
DESCRIPTION = (
3232
'A wrapper library to read, manipulate and write data in ods format'
3333
)
3434
URL = 'https://github.com/pyexcel/pyexcel-ods'
35-
DOWNLOAD_URL = '%s/archive/0.5.5.tar.gz' % URL
35+
DOWNLOAD_URL = '%s/archive/0.5.6.tar.gz' % URL
3636
FILES = ['README.rst', 'CHANGELOG.rst']
3737
KEYWORDS = [
3838
'python',
@@ -51,8 +51,8 @@
5151
]
5252

5353
INSTALL_REQUIRES = [
54-
'pyexcel-io>=0.5.10',
55-
'odfpy==1.3.5',
54+
'pyexcel-io>=0.5.16',
55+
'odfpy>=1.3.5',
5656
]
5757
SETUP_COMMANDS = {}
5858

@@ -63,8 +63,8 @@
6363
# You do not need to read beyond this line
6464
PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format(
6565
sys.executable)
66-
GS_COMMAND = ('gs pyexcel-ods v0.5.5 ' +
67-
"Find 0.5.5 in changelog for more details")
66+
GS_COMMAND = ('gs pyexcel-ods v0.5.6 ' +
67+
"Find 0.5.6 in changelog for more details")
6868
NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
6969
'Please install gease to enable it.')
7070
UPLOAD_FAILED_MSG = (

tests/base.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import datetime # noqa
22
import os # noqa
33

4-
from nose.tools import eq_, raises # noqa
5-
64
import pyexcel
5+
from nose.tools import eq_, raises # noqa
76

87

98
def create_sample_file1(file):

tests/test_bug_fixes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# -*- encoding: utf-8 -*-
33
import os
44

5-
from nose import SkipTest
6-
from nose.tools import eq_, raises
7-
85
import psutil
96
import pyexcel as pe
7+
from nose import SkipTest
8+
from nose.tools import eq_, raises
109
from pyexcel_io.exceptions import IntegerAccuracyLossError
10+
1111
from pyexcel_ods import get_data, save_data
1212

1313
IN_TRAVIS = "TRAVIS" in os.environ

tests/test_filter.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import os
22

33
from nose.tools import eq_
4-
54
from pyexcel_io import get_data, save_data
65

76

tests/test_formatters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import os
22
from textwrap import dedent
33

4-
from nose.tools import eq_
5-
64
import pyexcel as pe
5+
from nose.tools import eq_
76

87

98
class TestAutoDetectInt:

tests/test_multiple_sheets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import os
22
import sys
33

4+
import pyexcel
45
from nose.tools import raises
56

6-
import pyexcel
77
from base import PyexcelMultipleSheetBase
88

99
if sys.version_info[0] == 2 and sys.version_info[1] < 7:

tests/test_stringio.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22

3+
import pyexcel
34
from nose.tools import eq_
45

5-
import pyexcel
66
from base import create_sample_file1
77

88

0 commit comments

Comments
 (0)