diff --git a/.moban.yml b/.moban.yml index f773b2b..529a249 100644 --- a/.moban.yml +++ b/.moban.yml @@ -24,3 +24,4 @@ targets: - output: CHANGELOG.rst configuration: changelog.yml template: CHANGELOG.rst.jj2 + - lint.sh: lint.script.jj2 diff --git a/.travis.yml b/.travis.yml index ee3a11f..c2c6b83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,20 @@ python: - 3.6 - 3.5 - 2.7 + +stages: + - test + - lint +jobs: + include: + - stage: lint + python: 3.6 + script: make 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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1e4f69c..56917c6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,15 @@ Change log ================================================================================ +0.5.15 - 16.03.2019 +-------------------------------------------------------------------------------- + +updated +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +#. `pyexcel-ods#33 `_: fix + integer comparision error on i586 + 0.5.14 - 21.02.2019 -------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 7f442b5..7fe459a 100644 --- a/Makefile +++ b/Makefile @@ -6,3 +6,7 @@ test: document: sphinx-autogen -o docs/source/generated/ docs/source/*.rst sphinx-build -b html docs/source/ docs/build/ + +lint: + bash lint.sh + diff --git a/README.rst b/README.rst index 30562fd..62ae98b 100644 --- a/README.rst +++ b/README.rst @@ -78,8 +78,11 @@ sqlalchemy supported databases. Its supported file formats are extended to cover ======================== ======================= ================= ================== `pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3 `pyexcel-xlsxr`_ xlsx(read only) lxml same as above + `pyexcel-xlsbr`_ xlsx(read only) pyxlsb same as above `pyexcel-odsr`_ read only for ods, fods lxml same as above + `pyexcel-odsw`_ write only for ods loxun same as above `pyexcel-htmlr`_ html(read only) lxml,html5lib same as above + `pyexcel-pdfr`_ pdf(read only) pdftables Python 2 only. ======================== ======================= ================= ================== @@ -89,8 +92,12 @@ sqlalchemy supported databases. Its supported file formats are extended to cover .. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods .. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3 .. _pyexcel-odsr: https://github.com/pyexcel/pyexcel-odsr +.. _pyexcel-odsw: https://github.com/pyexcel/pyexcel-odsw +.. _pyexcel-pdfr: https://github.com/pyexcel/pyexcel-pdfr + .. _pyexcel-xlsxw: https://github.com/pyexcel/pyexcel-xlsxw .. _pyexcel-xlsxr: https://github.com/pyexcel/pyexcel-xlsxr +.. _pyexcel-xlsbr: https://github.com/pyexcel/pyexcel-xlsbr .. _pyexcel-htmlr: https://github.com/pyexcel/pyexcel-htmlr .. _xlrd: https://github.com/python-excel/xlrd diff --git a/changelog.yml b/changelog.yml index a916068..ed0bdce 100644 --- a/changelog.yml +++ b/changelog.yml @@ -1,6 +1,12 @@ name: pyexcel-io organisation: pyexcel releases: +- changes: + - action: updated + details: + - '`pyexcel-ods#33`: fix integer comparision error on i586' + version: 0.5.15 + date: 16.03.2019 - changes: - action: updated details: diff --git a/docs/source/conf.py b/docs/source/conf.py index 7741c61..bed6d04 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -26,9 +26,9 @@ project = 'pyexcel-io' copyright = 'copyright 2015-2019 Onni Software Ltd.' author = 'Onni Software Ltd.' # The short X.Y version -version = '0.5.14' +version = '0.5.15' # The full version, including alpha/beta/rc tags -release = '0.5.14' +release = '0.5.15' # -- General configuration --------------------------------------------------- diff --git a/docs/source/index.rst b/docs/source/index.rst index af27e3a..f5f2be0 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -85,8 +85,11 @@ For individual excel file formats, please install them as you wish: ======================== ======================= ================= ================== `pyexcel-xlsxw`_ xlsx(write only) `XlsxWriter`_ Python 2 and 3 `pyexcel-xlsxr`_ xlsx(read only) lxml same as above + `pyexcel-xlsbr`_ xlsx(read only) pyxlsb same as above `pyexcel-odsr`_ read only for ods, fods lxml same as above + `pyexcel-odsw`_ write only for ods loxun same as above `pyexcel-htmlr`_ html(read only) lxml,html5lib same as above + `pyexcel-pdfr`_ pdf(read only) pdftables Python 2 only. ======================== ======================= ================= ================== @@ -96,8 +99,12 @@ For individual excel file formats, please install them as you wish: .. _pyexcel-ods: https://github.com/pyexcel/pyexcel-ods .. _pyexcel-ods3: https://github.com/pyexcel/pyexcel-ods3 .. _pyexcel-odsr: https://github.com/pyexcel/pyexcel-odsr +.. _pyexcel-odsw: https://github.com/pyexcel/pyexcel-odsw +.. _pyexcel-pdfr: https://github.com/pyexcel/pyexcel-pdfr + .. _pyexcel-xlsxw: https://github.com/pyexcel/pyexcel-xlsxw .. _pyexcel-xlsxr: https://github.com/pyexcel/pyexcel-xlsxr +.. _pyexcel-xlsbr: https://github.com/pyexcel/pyexcel-xlsbr .. _pyexcel-htmlr: https://github.com/pyexcel/pyexcel-htmlr .. _xlrd: https://github.com/python-excel/xlrd diff --git a/lint.sh b/lint.sh new file mode 100644 index 0000000..12183c3 --- /dev/null +++ b/lint.sh @@ -0,0 +1 @@ +flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long \ No newline at end of file diff --git a/pyexcel-io.yml b/pyexcel-io.yml index ca50643..f906d2f 100644 --- a/pyexcel-io.yml +++ b/pyexcel-io.yml @@ -2,10 +2,10 @@ overrides: "pyexcel.yaml" project: "pyexcel-io" name: pyexcel-io nick_name: io -version: 0.5.14 -current_version: 0.5.14 +version: 0.5.15 +current_version: 0.5.15 copyright_year: 2015-2019 -release: 0.5.14 +release: 0.5.15 dependencies: - ordereddict;python_version<"2.7" - lml>=0.0.4 diff --git a/setup.py b/setup.py index 7c7ad1e..cf93e8d 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ except (ValueError, UnicodeError, locale.Error): NAME = 'pyexcel-io' AUTHOR = 'C.W.' -VERSION = '0.5.14' +VERSION = '0.5.15' EMAIL = 'wangc_2011@hotmail.com' LICENSE = 'New BSD' DESCRIPTION = ( @@ -37,7 +37,7 @@ DESCRIPTION = ( 'format and to/from databases' ) URL = 'https://github.com/pyexcel/pyexcel-io' -DOWNLOAD_URL = '%s/archive/0.5.14.tar.gz' % URL +DOWNLOAD_URL = '%s/archive/0.5.15.tar.gz' % URL FILES = ['README.rst', 'CHANGELOG.rst'] KEYWORDS = [ 'python', @@ -81,8 +81,8 @@ EXTRAS_REQUIRE = { # 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-io v0.5.14 ' + - "Find 0.5.14 in changelog for more details") +GS_COMMAND = ('gs pyexcel-io v0.5.15 ' + + "Find 0.5.15 in changelog for more details") NO_GS_MESSAGE = ('Automatic github release is disabled. ' + 'Please install gease to enable it.') UPLOAD_FAILED_MSG = ( diff --git a/test.bat b/test.bat index b083787..9e24a8c 100644 --- a/test.bat +++ b/test.bat @@ -1,2 +1,2 @@ pip freeze -nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io && flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long +nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io diff --git a/test.sh b/test.sh index b083787..9e24a8c 100644 --- a/test.sh +++ b/test.sh @@ -1,2 +1,2 @@ pip freeze -nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io && flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long +nosetests --with-coverage --cover-package pyexcel_io --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_io diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29