Merge pull request #64 from pyexcel/0.5.x

chfw · web-flow · commit cd4e6476770e · 2019-02-12T07:42:46.000Z
🥚 🎡 0.5.13.
diff --git a/.moban.yml b/.moban.yml
@@ -1,8 +1,13 @@
+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-io.yml
 targets:
@@ -12,7 +17,6 @@ targets:
   - requirements.txt: requirements.txt.jj2
   - "tests/requirements.txt": "tests/requirements.txt"
   - LICENSE: NEW_BSD_LICENSE.jj2
-  - MANIFEST.in: MANIFEST.in.jj2
   - test.sh: test.script.jj2
   - test.bat: test.script.jj2
   - README.rst: README.rst
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,26 @@
 Change log
 ================================================================================
 
+0.5.13 - 12.02.2019
+--------------------------------------------------------------------------------
+
+updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#63 <https://github.com/pyexcel/pyexcel-io/issues/63>`_: Version 0.5.12
+   prevents xslx and ods plugin from being loaded
+
+0.5.12 - 9.02.2019
+--------------------------------------------------------------------------------
+
+updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+#. `#60 <https://github.com/pyexcel/pyexcel-io/issues/60>`_: include tests in
+   tar ball
+#. `#61 <https://github.com/pyexcel/pyexcel-io/issues/61>`_: enable python
+   setup.py test
+
 0.5.10 - 3.12.2018
 --------------------------------------------------------------------------------
 
diff --git a/LICENSE b/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
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,8 @@
 include README.rst
 include LICENSE
 include CHANGELOG.rst
+recursive-include tests *
+include docs/source/*
+include Makefile
+include test.sh
+
diff --git a/README.rst b/README.rst
@@ -211,6 +211,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
diff --git a/changelog.yml b/changelog.yml
@@ -1,6 +1,19 @@
 name: pyexcel-io
 organisation: pyexcel
 releases:
+- changes:
+  - action: updated
+    details:
+    - '`#63`: Version 0.5.12 prevents xslx and ods plugin from being loaded'
+  version: 0.5.13
+  date: 12.02.2019
+- changes:
+  - action: updated
+    details:
+    - '`#60`: include tests in tar ball'
+    - '`#61`: enable python setup.py test'
+  version: 0.5.12
+  date: 9.02.2019
 - changes:
   - action: updated
     details:
diff --git a/pyexcel-io.yml b/pyexcel-io.yml
@@ -1,9 +1,9 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-io"
 nick_name: io
-version: 0.5.11
-current_version: 0.5.11
-release: 0.5.11
+version: 0.5.13
+current_version: 0.5.13
+release: 0.5.13
 dependencies:
   - ordereddict;python_version<"2.7"
   - lml>=0.0.4
diff --git a/setup.py b/setup.py
@@ -4,24 +4,40 @@
 import os
 import sys
 import codecs
+import locale
+import platform
 from shutil import rmtree
 
 from setuptools import Command, setup, find_packages
 
 PY2 = sys.version_info[0] == 2
 PY26 = PY2 and sys.version_info[1] < 7
+PY33 = sys.version_info < (3, 4)
+
+# 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-io'
 AUTHOR = 'C.W.'
-VERSION = '0.5.11'
+VERSION = '0.5.13'
 EMAIL = 'wangc_2011@hotmail.com'
 LICENSE = 'New BSD'
 DESCRIPTION = (
     'A python library to read and write structured data in csv, zipped csv' +
     'format and to/from databases'
 )
 URL = 'https://github.com/pyexcel/pyexcel-io'
-DOWNLOAD_URL = '%s/archive/0.5.11.tar.gz' % URL
+DOWNLOAD_URL = '%s/archive/0.5.13.tar.gz' % URL
 FILES = ['README.rst', 'CHANGELOG.rst']
 KEYWORDS = [
     'python',
@@ -65,8 +81,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-io v0.5.11 ' +
-              "Find 0.5.11 in changelog for more details")
+GS_COMMAND = ('gs pyexcel-io v0.5.13 ' +
+              "Find 0.5.13 in changelog for more details")
 NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
                  'Please install gease to enable it.')
 UPLOAD_FAILED_MSG = (
@@ -175,6 +191,7 @@ def filter_out_test_code(file_handle):
 
 if __name__ == '__main__':
     setup(
+        test_suite="tests",
         name=NAME,
         author=AUTHOR,
         version=VERSION,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2015-2018 by Onni Software Ltd. and its contributors`
	`1`	`+Copyright (c) 2015-2019 by Onni Software Ltd. and its contributors`
`2`	`2`	`All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms of the software as well`