release 0.5.7

.moban.d/tests/base.py

@@ -1,4 +1,4 @@
 {% extends 'tests/base.py.jj2' %}
 
 {%block ods_types%}
-{%endblock%}
+{%endblock%}

.moban.d/tests/requirements.txt

@@ -2,4 +2,7 @@
 {%block extras %}
 pyexcel
 pyexcel-xls
+moban
+black;python_version>="3.6"
+isort;python_version>="3.6"
 {%endblock%}

.moban.d/tests/test_formatters.py

@@ -1,4 +1,4 @@
 {% extends 'tests/test_formatters.py.jj2' %}
 
 {%block xlsx_exception%}
-{%endblock%}
+{%endblock%}

.moban.yml

@@ -1,11 +1,17 @@
+requires:
+  - type: git
+    url: https://github.com/moremoban/pypi-mobans
+    submodule: true
+  - https://github.com/pyexcel/pyexcel-mobans
 configuration:
-  configuration_dir: "commons/config"
+  configuration_dir: "pyexcel-mobans:config"
   template_dir:
-  - "commons/templates"
-  - "setupmobans/templates"
+  - "pyexcel-mobans:templates"
+  - "pypi-mobans:templates"
   - ".moban.d"
   configuration: pyexcel-xlsx.yml
 targets:
+  - Pipfile: Pipfile.jj2
   - README.rst: README.rst
   - setup.py: setup.py
   - "docs/source/conf.py": "docs/source/conf.py.jj2"

.travis.yml

@@ -1,12 +1,15 @@
 sudo: false
+dist: xenial
 language: python
 notifications:
   email: false
 python:
-  - pypy-5.3.1
+  - &pypy2 pypy2.7-6.0
+  - &pypy3 pypy3.5-6.0
+  - 3.8-dev
+  - 3.7
   - 3.6
   - 3.5
-  - 3.4
   - 2.7
 before_install:
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Change log
 ================================================================================
 
+0.5.7 - 15.02.2019
+--------------------------------------------------------------------------------
+
+Added
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. pyexcel-io#66 pin openpyxl < 2.6.0
+
 0.5.6 - 26.03.2018
 --------------------------------------------------------------------------------
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2018 by Onni Software Ltd. and its contributors
+Copyright (c)  by Onni Software Ltd. and its contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms of the software as well
@@ -13,7 +13,7 @@ that the following conditions are met:
   and/or other materials provided with the distribution.
 
 * Neither the name of 'pyexcel-xlsx' nor the names of the contributors
-  may not be used to endorse or promote products derived from this software
+  may be used to endorse or promote products derived from this software
   without specific prior written permission.
 
 THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE COPYRIGHT HOLDERS AND
@@ -27,4 +27,4 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE AND DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
+DAMAGE.

Makefile

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

Pipfile

@@ -0,0 +1,18 @@
+[[source]]
+url = 'https://pypi.python.org/simple'
+verify_ssl = true
+name = 'pypi'
+
+[requires]
+python_version= '3.6'
+
+[packages]
+    openpyxl>=2.5.0,<2.6.0
+    pyexcel-io>=0.5.3
+
+[dev-packages]
+nose = "*"
+mock = "*"
+codecov = "*"
+coverage = "*"
+flake8 = "*"

README.rst

@@ -373,6 +373,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-xlsx
 organisation: pyexcel
 releases:
+- changes:
+  - action: Added
+    details:
+    - 'pyexcel-io#66 pin openpyxl < 2.6.0'
+  date: 15.02.2019
+  version: 0.5.7
 - changes:
   - action: Added
     details:

docs/source/conf.py

@@ -4,43 +4,129 @@
     'format' +
     ''
 )
-extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.doctest',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
-]
-intersphinx_mapping = {
-    'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
-}
+# Configuration file for the Sphinx documentation builder.
+#
+# 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 --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+
+# -- Project information -----------------------------------------------------
+
+project = 'pyexcel-xlsx'
+copyright = 'copyright 2015-2019 Onni Software Ltd.'
+author = 'Onni Software Ltd.'
+
+# The short X.Y version
+version = '0.5.7'
+# The full version, including alpha/beta/rc tags
+release = '0.5.7'
+
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [    'sphinx.ext.autodoc',    'sphinx.ext.doctest',    'sphinx.ext.intersphinx',    'sphinx.ext.viewcode',]
+
+# 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'
 
-project = u'pyexcel-xlsx'
-copyright = u'2015-2018 Onni Software Ltd.'
-version = '0.5.6'
-release = '0.5.6'
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = 'en'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = []
-pygments_style = 'sphinx'
-html_theme = 'default'
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+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']
-htmlhelp_basename = 'pyexcel-xlsxdoc'
-latex_elements = {}
-latex_documents = [
-    ('index', 'pyexcel-xlsx.tex',
-     'pyexcel-xlsx Documentation',
-     'Onni Software Ltd.', 'manual'),
-]
-man_pages = [
-    ('index', 'pyexcel-xlsx',
-     'pyexcel-xlsx Documentation',
-     [u'Onni Software Ltd.'], 1)
-]
+
+# 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 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 ---------------------------------------
+
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {'https://docs.python.org/': None}
+
+# TODO: html_theme not configurable upstream
+html_theme = 'default'
+
+# TODO: DESCRIPTION not configurable upstream
 texinfo_documents = [
     ('index', 'pyexcel-xlsx',
      'pyexcel-xlsx Documentation',
      'Onni Software Ltd.', 'pyexcel-xlsx',
      DESCRIPTION,
      'Miscellaneous'),
 ]
+intersphinx_mapping.update({
+    'pyexcel': ('http://pyexcel.readthedocs.io/en/latest/', None),
+})

pyexcel-xlsx.yml

@@ -1,11 +1,13 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-xlsx"
+project: "pyexcel-xlsx"
 nick_name: xlsx
-version: 0.5.6
-current_version: 0.5.6
-release: 0.5.6
+version: 0.5.7
+current_version: 0.5.7
+release: 0.5.7
 file_type: xlsx
+gitignore_language: Python
 dependencies:
-  - openpyxl>=2.5.0
+  - openpyxl>=2.5.0,<2.6.0
   - pyexcel-io>=0.5.3
 description: A wrapper library to read, manipulate and write data in xlsx and xlsm format

pyexcel_xlsx/__init__.py

@@ -9,18 +9,21 @@
 """
 from pyexcel_io.plugins import IOPluginInfoChain
 from pyexcel_io.io import (
-    get_data as read_data, isstream, store_data as write_data)
+    get_data as read_data,
+    isstream,
+    save_data as write_data,
+)
 
 
-__FILE_TYPE__ = 'xlsx'
+__FILE_TYPE__ = "xlsx"
 IOPluginInfoChain(__name__).add_a_reader(
-    relative_plugin_class_path='xlsxr.XLSXBook',
-    file_types=[__FILE_TYPE__, 'xlsm'],
-    stream_type='binary'
+    relative_plugin_class_path="xlsxr.XLSXBook",
+    file_types=[__FILE_TYPE__, "xlsm"],
+    stream_type="binary",
 ).add_a_writer(
-    relative_plugin_class_path='xlsxw.XLSXWriter',
-    file_types=[__FILE_TYPE__, 'xlsm'],
-    stream_type='binary'
+    relative_plugin_class_path="xlsxw.XLSXWriter",
+    file_types=[__FILE_TYPE__, "xlsm"],
+    stream_type="binary",
 )