Merge pull request #34 from pyexcel/dev

release 0.5.5

.moban.d/travis.yml

@@ -2,10 +2,10 @@
 
 {%block custom_python_versions%}
 python:
-  - 3.7-dev
+  - 3.8-dev
+  - 3.7
   - 3.6
   - 3.5
-  - 3.4
   - 2.7
 {%endblock%}
 

.moban.yml

@@ -29,4 +29,5 @@ targets:
   - "tests/base.py": "tests/base.py.jj2"
   - output: CHANGELOG.rst
     configuration: changelog.yml
-    template: CHANGELOG.rst.jj2
+    template: CHANGELOG.rst.jj2
+  - lint.sh: lint.script.jj2

.travis.yml

@@ -1,13 +1,28 @@
 sudo: false
+dist: xenial
 language: python
 notifications:
   email: false
 python:
-  - 3.7-dev
+  - 3.8-dev
+  - 3.7
   - 3.6
   - 3.5
-  - 3.4
   - 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

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Change log
 ================================================================================
 
+0.5.5 - 16.03.2019
+--------------------------------------------------------------------------------
+
+added
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#32 <https://github.com/pyexcel/pyexcel-ods/issues/32>`_, fix odfpy pinning
+
 0.5.4 - 27.11.2018
 --------------------------------------------------------------------------------
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 by Onni Software Ltd. and its contributors
+Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms of the software as well

MANIFEST.in

@@ -1,3 +1,5 @@
 include README.rst
 include LICENSE
 include CHANGELOG.rst
+recursive-include tests *
+recursive-include docs *

Makefile

@@ -7,3 +7,6 @@ format:
 	isort -y $(find pyexcel_ods -name "*.py"|xargs echo) $(find tests -name "*.py"|xargs echo)
 	black -l 79 pyexcel_ods
 	black -l 79 tests
+
+lint:
+	bash lint.sh

README.rst

@@ -375,6 +375,7 @@ Acceptance criteria
 #. Has all code lines tested
 #. Passes all Travis CI builds
 #. Has fair amount of documentation if your change is complex
+#. run 'make format' so as to confirm the pyexcel organisation's coding style
 #. Please update CHANGELOG.rst
 #. Please add yourself to CONTRIBUTORS.rst
 #. Agree on NEW BSD License for your contribution

changelog.yml

@@ -1,6 +1,12 @@
 name: pyexcel-ods
 organisation: pyexcel
 releases:
+- changes:
+  - action: added
+    details:
+    - '`#32`, fix odfpy pinning'
+  date: 16.03.2019
+  version: 0.5.5
 - changes:
   - action: added
     details:

docs/source/conf.py

@@ -3,12 +3,10 @@ DESCRIPTION = (
     'A wrapper library to read, manipulate and write data in ods format' +
     ''
 )
-# -*- coding: utf-8 -*-
-#
 # Configuration file for the Sphinx documentation builder.
 #
-# This file does only contain a selection of the most common options. For a
-# full list see the documentation:
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
 # http://www.sphinx-doc.org/en/master/config
 
 # -- Path setup --------------------------------------------------------------
@@ -23,22 +21,16 @@ DESCRIPTION = (
 
 # -- Project information -----------------------------------------------------
 
-project = u'pyexcel-ods'
-copyright = u'2015-2018 Onni Software Ltd.'
-author = u'C.W.'
-
+project = 'pyexcel'
+copyright = 'copyright 2015-2019 Onni Software Ltd.'
+author = 'Onni Software Ltd.'
 # The short X.Y version
-version = u'0.5.4'
+version = '0.5.5'
 # The full version, including alpha/beta/rc tags
-release = u'0.5.4'
-
+release = '0.5.5'
 
 # -- General configuration ---------------------------------------------------
 
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
@@ -47,15 +39,6 @@ extensions = [    'sphinx.ext.autodoc',    'sphinx.ext.doctest',    'sphinx.ext.
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #
@@ -68,9 +51,6 @@ language = 'en'
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = []
 
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = None
-
 
 # -- Options for HTML output -------------------------------------------------
 
@@ -79,102 +59,11 @@ pygments_style = None
 #
 html_theme = 'alabaster'
 
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself.  Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-#
-# html_sidebars = {}
-
-
-# -- Options for HTMLHelp output ---------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'pyexcel-odsdoc'
-
-
-# -- Options for LaTeX output ------------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #
-    # 'preamble': '',
-
-    # Latex figure (float) alignment
-    #
-    # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-    (master_doc, 'pyexcel-ods.tex', u'pyexcel-ods Documentation',
-     u'Onni Software Ltd.', 'manual'),
-]
-
-
-# -- Options for manual page output ------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'pyexcel-ods', u'pyexcel-ods Documentation',
-     [author], 1)
-]
-
-
-# -- Options for Texinfo output ----------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'pyexcel-ods', u'pyexcel-ods Documentation',
-     author, 'pyexcel-ods', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-
-# -- Options for Epub output -------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#
-# epub_identifier = ''
-
-# A unique identification for the text.
-#
-# epub_uid = ''
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
-
 # -- Extension configuration -------------------------------------------------
 # -- Options for intersphinx extension ---------------------------------------
 

lint.sh

@@ -0,0 +1 @@
+flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long

pyexcel-ods.yml

@@ -1,9 +1,10 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-ods"
 nick_name: ods
-version: 0.5.4
-current_version: 0.5.4
-release: 0.5.4
+version: 0.5.5
+current_version: 0.5.5
+release: 0.5.5
+copyright_year: 2015-2019
 file_type: ods
 dependencies:
   - pyexcel-io>=0.5.10

setup.py

@@ -1,23 +1,38 @@
 #!/usr/bin/env python3
 
 import codecs
+import locale
 # Template by pypi-mobans
 import os
+import platform
 import sys
 from shutil import rmtree
 
 from setuptools import Command, find_packages, setup
 
+# Work around mbcs bug in distutils.
+# http://bugs.python.org/issue10945
+# This work around is only if a project supports Python < 3.4
+
+# Work around for locale not being set
+try:
+    lc = locale.getlocale()
+    pf = platform.system()
+    if pf != 'Windows' and lc == (None, None):
+        locale.setlocale(locale.LC_ALL, 'C.UTF-8')
+except (ValueError, UnicodeError, locale.Error):
+    locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')
+
 NAME = 'pyexcel-ods'
 AUTHOR = 'C.W.'
-VERSION = '0.5.4'
+VERSION = '0.5.5'
 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.4.tar.gz' % URL
+DOWNLOAD_URL = '%s/archive/0.5.5.tar.gz' % URL
 FILES = ['README.rst', 'CHANGELOG.rst']
 KEYWORDS = [
     'python',
@@ -48,8 +63,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-ods v0.5.4 ' +
-              "Find 0.5.4 in changelog for more details")
+GS_COMMAND = ('gs pyexcel-ods v0.5.5 ' +
+              "Find 0.5.5 in changelog for more details")
 NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
                  'Please install gease to enable it.')
 UPLOAD_FAILED_MSG = (
@@ -158,6 +173,7 @@ def filter_out_test_code(file_handle):
 
 if __name__ == '__main__':
     setup(
+        test_suite="tests",
         name=NAME,
         author=AUTHOR,
         version=VERSION,

test.bat

@@ -1,2 +1,2 @@
 pip freeze
-nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods && flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long
+nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods

test.sh

@@ -1,2 +1,2 @@
 pip freeze
-nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods && flake8 . --exclude=.moban.d,docs --builtins=unicode,xrange,long
+nosetests --with-coverage --cover-package pyexcel_ods --cover-package tests tests --with-doctest --doctest-extension=.rst README.rst docs/source pyexcel_ods

tests/base.py

@@ -1,9 +1,10 @@
 import datetime  # noqa
 import os  # noqa
 
-import pyexcel
 from nose.tools import eq_, raises  # noqa
 
+import pyexcel
+
 
 def create_sample_file1(file):
     data = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", 1.1, 1]

tests/test_bug_fixes.py

@@ -2,12 +2,12 @@
 # -*- encoding: utf-8 -*-
 import os
 
-import psutil
-import pyexcel as pe
 from nose import SkipTest
 from nose.tools import eq_, raises
-from pyexcel_io.exceptions import IntegerAccuracyLossError
 
+import psutil
+import pyexcel as pe
+from pyexcel_io.exceptions import IntegerAccuracyLossError
 from pyexcel_ods import get_data, save_data
 
 IN_TRAVIS = "TRAVIS" in os.environ

tests/test_filter.py

@@ -1,6 +1,7 @@
 import os
 
 from nose.tools import eq_
+
 from pyexcel_io import get_data, save_data
 
 

tests/test_formatters.py

@@ -1,9 +1,10 @@
 import os
 from textwrap import dedent
 
-import pyexcel as pe
 from nose.tools import eq_
 
+import pyexcel as pe
+
 
 class TestAutoDetectInt:
     def setUp(self):

tests/test_multiple_sheets.py

@@ -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:

tests/test_stringio.py

@@ -1,8 +1,8 @@
 import os
 
-import pyexcel
 from nose.tools import eq_
 
+import pyexcel
 from base import create_sample_file1