Skip to content

Commit

Permalink
🥚 🎡 release 0.5.6. fix #33, #32
Browse files Browse the repository at this point in the history
  • Loading branch information
chfw committed Mar 19, 2019
1 parent a8bbf35 commit 87e7a33
Show file tree
Hide file tree
Showing 16 changed files with 67 additions and 39 deletions.
20 changes: 16 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,30 @@ python:
stages:
- test
- lint

.disable_global: &disable_global
before_install: false
install: true
before_script: false
after_success: false
after_failure: false

.lint: &lint
<<: *disable_global
python: 3.6
stage: lint
install: pip install flake8
script: flake8

jobs:
include:
- stage: lint
python: 3.6
script: make lint
- *lint

stage: test

script: make test

before_install:
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then
mv min_requirements.txt requirements.txt ;
fi
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Change log
================================================================================

0.5.6 - 19.03.2019
--------------------------------------------------------------------------------

added
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

#. `#32 <https://github.com/pyexcel/pyexcel-ods/issues/32>`_, fix odfpy pinning
#. `#33 <https://github.com/pyexcel/pyexcel-ods/issues/33>`_, fix
IntegerAccuracyLossError on i586

0.5.5 - 16.03.2019
--------------------------------------------------------------------------------

Expand Down
7 changes: 7 additions & 0 deletions changelog.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: pyexcel-ods
organisation: pyexcel
releases:
- changes:
- action: added
details:
- '`#32`, fix odfpy pinning'
- '`#33`, fix IntegerAccuracyLossError on i586'
date: 19.03.2019
version: 0.5.6
- changes:
- action: added
details:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
copyright = 'copyright 2015-2019 Onni Software Ltd.'
author = 'Onni Software Ltd.'
# The short X.Y version
version = '0.5.5'
version = '0.5.6'
# The full version, including alpha/beta/rc tags
release = '0.5.5'
release = '0.5.6'

# -- General configuration ---------------------------------------------------

Expand Down
10 changes: 5 additions & 5 deletions pyexcel-ods.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
overrides: "pyexcel.yaml"
name: "pyexcel-ods"
nick_name: ods
version: 0.5.5
current_version: 0.5.5
release: 0.5.5
version: 0.5.6
current_version: 0.5.6
release: 0.5.6
copyright_year: 2015-2019
file_type: ods
dependencies:
- pyexcel-io>=0.5.10
- odfpy==1.3.5
- pyexcel-io>=0.5.16
- odfpy>=1.3.5
description: A wrapper library to read, manipulate and write data in ods format
10 changes: 5 additions & 5 deletions pyexcel_ods/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
:copyright: (c) 2015-2017 by Onni Software Ltd & its contributors
:license: New BSD License
"""

# flake8: noqa
from pyexcel_io.io import get_data as read_data
from pyexcel_io.io import isstream
from pyexcel_io.io import store_data as write_data

# this line has to be place above all else
# because of dynamic import
from pyexcel_io.plugins import IOPluginInfoChain
from pyexcel_io.io import (
get_data as read_data,
isstream,
store_data as write_data,
)

__FILE_TYPE__ = "ods"
IOPluginInfoChain(__name__).add_a_reader(
Expand Down
7 changes: 4 additions & 3 deletions pyexcel_ods/odsr.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,17 @@
# limitations under the License.

import pyexcel_io.service as service
from pyexcel_io._compact import OrderedDict
from pyexcel_io.book import BookReader
from pyexcel_io.sheet import SheetReader

from odf.namespaces import OFFICENS
from odf.opendocument import load
from odf.table import Table, TableCell, TableRow

# Thanks to grt for the fixes
from odf.teletype import extractText
from odf.text import P
from pyexcel_io._compact import OrderedDict
from pyexcel_io.book import BookReader
from pyexcel_io.sheet import SheetReader


class ODSSheet(SheetReader):
Expand Down
5 changes: 3 additions & 2 deletions pyexcel_ods/odsw.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
import sys

import pyexcel_io.service as converter
from pyexcel_io.book import BookWriter
from pyexcel_io.sheet import SheetWriter

from odf.namespaces import OFFICENS
from odf.opendocument import OpenDocumentSpreadsheet
from odf.table import Table, TableCell, TableRow
from odf.text import P
from pyexcel_io.book import BookWriter
from pyexcel_io.sheet import SheetWriter

PY2 = sys.version_info[0] == 2

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
pyexcel-io>=0.5.10
odfpy==1.3.5
pyexcel-io>=0.5.16
odfpy>=1.3.5
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@

NAME = 'pyexcel-ods'
AUTHOR = 'C.W.'
VERSION = '0.5.5'
VERSION = '0.5.6'
EMAIL = 'wangc_2011@hotmail.com'
LICENSE = 'New BSD'
DESCRIPTION = (
'A wrapper library to read, manipulate and write data in ods format'
)
URL = 'https://github.com/pyexcel/pyexcel-ods'
DOWNLOAD_URL = '%s/archive/0.5.5.tar.gz' % URL
DOWNLOAD_URL = '%s/archive/0.5.6.tar.gz' % URL
FILES = ['README.rst', 'CHANGELOG.rst']
KEYWORDS = [
'python',
Expand All @@ -51,8 +51,8 @@
]

INSTALL_REQUIRES = [
'pyexcel-io>=0.5.10',
'odfpy==1.3.5',
'pyexcel-io>=0.5.16',
'odfpy>=1.3.5',
]
SETUP_COMMANDS = {}

Expand All @@ -63,8 +63,8 @@
# You do not need to read beyond this line
PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format(
sys.executable)
GS_COMMAND = ('gs pyexcel-ods v0.5.5 ' +
"Find 0.5.5 in changelog for more details")
GS_COMMAND = ('gs pyexcel-ods v0.5.6 ' +
"Find 0.5.6 in changelog for more details")
NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
'Please install gease to enable it.')
UPLOAD_FAILED_MSG = (
Expand Down
3 changes: 1 addition & 2 deletions tests/base.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import datetime # noqa
import os # noqa

from nose.tools import eq_, raises # noqa

import pyexcel
from nose.tools import eq_, raises # noqa


def create_sample_file1(file):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_bug_fixes.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# -*- encoding: utf-8 -*-
import os

from nose import SkipTest
from nose.tools import eq_, raises

import psutil
import pyexcel as pe
from nose import SkipTest
from nose.tools import eq_, raises
from pyexcel_io.exceptions import IntegerAccuracyLossError

from pyexcel_ods import get_data, save_data

IN_TRAVIS = "TRAVIS" in os.environ
Expand Down
1 change: 0 additions & 1 deletion tests/test_filter.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import os

from nose.tools import eq_

from pyexcel_io import get_data, save_data


Expand Down
3 changes: 1 addition & 2 deletions tests/test_formatters.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import os
from textwrap import dedent

from nose.tools import eq_

import pyexcel as pe
from nose.tools import eq_


class TestAutoDetectInt:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_multiple_sheets.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import os
import sys

import pyexcel
from nose.tools import raises

import pyexcel
from base import PyexcelMultipleSheetBase

if sys.version_info[0] == 2 and sys.version_info[1] < 7:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_stringio.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import os

import pyexcel
from nose.tools import eq_

import pyexcel
from base import create_sample_file1


Expand Down

0 comments on commit 87e7a33

Please sign in to comment.