Merge pull request #36 from pyexcel/dev

🤝 synchronize setup.py too for 0.5.8

Author: chfw

.moban.d/setup.py .moban.d/custom_setup.py.jj2.moban.d/setup.py renamed to .moban.d/custom_setup.py.jj2

@@ -4,7 +4,7 @@ configuration:
 targets:
   - Pipfile: Pipfile.jj2
   - README.rst: custom_README.rst.jj2
-  - setup.py: setup.py
+  - setup.py: custom_setup.py.jj2
   - "docs/source/conf.py": "docs/source/conf.py.jj2"
   - .travis.yml: custom_travis.yml.jj2
   - MANIFEST.in: MANIFEST.in.jj2

.moban.yml

@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 
 # Template by pypi-mobans
-import os
-import sys
 import codecs
 import locale
+import os
 import platform
+import sys
 from shutil import rmtree
 
-from setuptools import Command, setup, find_packages
+from setuptools import Command, find_packages, setup
+
 
 # Work around mbcs bug in distutils.
 # http://bugs.python.org/issue10945
@@ -18,58 +19,62 @@
 try:
     lc = locale.getlocale()
     pf = platform.system()
-    if pf != 'Windows' and lc == (None, None):
-        locale.setlocale(locale.LC_ALL, 'C.UTF-8')
+    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')
+    locale.setlocale(locale.LC_ALL, "en_US.UTF-8")
 
-NAME = 'pyexcel-xlsx'
-AUTHOR = 'C.W.'
-VERSION = '0.5.7'
-EMAIL = '[email protected]'
-LICENSE = 'New BSD'
+NAME = "pyexcel-xlsx"
+AUTHOR = "C.W."
+VERSION = "0.5.8"
+EMAIL = "[email protected]"
+LICENSE = "New BSD"
 DESCRIPTION = (
-    'A wrapper library to read, manipulate and write data in xlsx and xlsm' +
-    'format'
+    "A wrapper library to read, manipulate and write data in xlsx and xlsm" +
+    "format"
 )
-URL = 'https://github.com/pyexcel/pyexcel-xlsx'
-DOWNLOAD_URL = '%s/archive/0.5.7.tar.gz' % URL
-FILES = ['README.rst', 'CHANGELOG.rst']
+URL = "https://github.com/pyexcel/pyexcel-xlsx"
+DOWNLOAD_URL = "%s/archive/0.5.8.tar.gz" % URL
+FILES = ["README.rst", "CHANGELOG.rst"]
 KEYWORDS = [
-    'python',
+    "python",
     'xlsx'
 ]
 
 CLASSIFIERS = [
-    'Topic :: Software Development :: Libraries',
-    'Programming Language :: Python',
-    'Intended Audience :: Developers',
-    'Programming Language :: Python :: 2.6',
-    'Programming Language :: Python :: 2.7',
-    'Programming Language :: Python :: 3.3',
-    'Programming Language :: Python :: 3.4',
-    'Programming Language :: Python :: 3.5',
-    'Programming Language :: Python :: 3.6',
+    "Topic :: Software Development :: Libraries",
+    "Programming Language :: Python",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 2.6",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3.3",
+    "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+
+    "Programming Language :: Python :: 3.7",
+
+    "Programming Language :: Python :: 3.8",
+
     'Programming Language :: Python :: Implementation :: PyPy'
 ]
 
 INSTALL_REQUIRES = [
-    'openpyxl>=2.5.0,<2.6.0',
-    'pyexcel-io>=0.5.3',
+    "openpyxl>=2.6.1",
+    "pyexcel-io>=0.5.3",
 ]
 SETUP_COMMANDS = {}
 
 
-PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
+PACKAGES = find_packages(exclude=["ez_setup", "examples", "tests"])
 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-xlsx v0.5.7 ' +
-              "Find 0.5.7 in changelog for more details")
-NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
-                 'Please install gease to enable it.')
+PUBLISH_COMMAND = "{0} setup.py sdist bdist_wheel upload -r pypi".format(sys.executable)
+GS_COMMAND = ("gs pyexcel-xlsx v0.5.8 " +
+              "Find 0.5.8 in changelog for more details")
+NO_GS_MESSAGE = ("Automatic github release is disabled. " +
+                 "Please install gease to enable it.")
 UPLOAD_FAILED_MSG = (
     'Upload failed. please run "%s" yourself.' % PUBLISH_COMMAND)
 HERE = os.path.abspath(os.path.dirname(__file__))
@@ -78,13 +83,13 @@
 class PublishCommand(Command):
     """Support setup.py upload."""
 
-    description = 'Build and publish the package on github and pypi'
+    description = "Build and publish the package on github and pypi"
     user_options = []
 
     @staticmethod
     def status(s):
         """Prints things in bold."""
-        print('\033[1m{0}\033[0m'.format(s))
+        print("\033[1m{0}\033[0m".format(s))
 
     def initialize_options(self):
         pass
@@ -94,28 +99,28 @@ def finalize_options(self):
 
     def run(self):
         try:
-            self.status('Removing previous builds...')
-            rmtree(os.path.join(HERE, 'dist'))
-            rmtree(os.path.join(HERE, 'build'))
-            rmtree(os.path.join(HERE, 'pyexcel_xlsx.egg-info'))
+            self.status("Removing previous builds...")
+            rmtree(os.path.join(HERE, "dist"))
+            rmtree(os.path.join(HERE, "build"))
+            rmtree(os.path.join(HERE, "pyexcel_xlsx.egg-info"))
         except OSError:
             pass
 
-        self.status('Building Source and Wheel (universal) distribution...')
+        self.status("Building Source and Wheel (universal) distribution...")
         run_status = True
         if has_gease():
             run_status = os.system(GS_COMMAND) == 0
         else:
             self.status(NO_GS_MESSAGE)
         if run_status:
             if os.system(PUBLISH_COMMAND) != 0:
-                self.status(UPLOAD_FAILED_MSG % PUBLISH_COMMAND)
+                self.status(UPLOAD_FAILED_MSG)
 
         sys.exit()
 
 
 SETUP_COMMANDS.update({
-    'publish': PublishCommand
+    "publish": PublishCommand
 })
 
 
@@ -144,7 +149,7 @@ def read_files(*files):
 def read(afile):
     """Read a file into setup"""
     the_relative_file = os.path.join(HERE, afile)
-    with codecs.open(the_relative_file, 'r', 'utf-8') as opened_file:
+    with codecs.open(the_relative_file, "r", "utf-8") as opened_file:
         content = filter_out_test_code(opened_file)
         content = "".join(list(content))
         return content
@@ -153,11 +158,11 @@ def read(afile):
 def filter_out_test_code(file_handle):
     found_test_code = False
     for line in file_handle.readlines():
-        if line.startswith('.. testcode:'):
+        if line.startswith(".. testcode:"):
             found_test_code = True
             continue
         if found_test_code is True:
-            if line.startswith('  '):
+            if line.startswith("  "):
                 continue
             else:
                 empty_line = line.strip()
@@ -167,14 +172,14 @@ def filter_out_test_code(file_handle):
                     found_test_code = False
                     yield line
         else:
-            for keyword in ['|version|', '|today|']:
+            for keyword in ["|version|", "|today|"]:
                 if keyword in line:
                     break
             else:
                 yield line
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     setup(
         test_suite="tests",
         name=NAME,
@@ -188,7 +193,7 @@ def filter_out_test_code(file_handle):
         license=LICENSE,
         keywords=KEYWORDS,
         extras_require=EXTRAS_REQUIRE,
-        tests_require=['nose'],
+        tests_require=["nose"],
         install_requires=INSTALL_REQUIRES,
         packages=PACKAGES,
         include_package_data=True,