From e849d0d14ecd1ca4cb3e73fc526b55350cc749ba Mon Sep 17 00:00:00 2001 From: chfw Date: Wed, 21 Oct 2020 09:35:59 +0100 Subject: [PATCH] :hammer: update setup.py. https://github.com/pyexcel/pyexcel-xlsx/issues/46 --- CHANGELOG.rst | 8 ++++++++ README.rst | 4 +++- changelog.yml | 6 ++++++ docs/source/conf.py | 6 +++--- lint.sh | 2 +- pyexcel-xls.yml | 8 +++++--- setup.py | 26 ++++++++++++++------------ 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fc8392a..dd11453 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,14 @@ Change log ================================================================================ +0.6.1 - 21.10.2020 +-------------------------------------------------------------------------------- + +**Updated** + +#. Restrict this library to get installed on python 3.6+, because pyexcel-io + 0.6.0+ supports only python 3.6+. + 0.6.0 - 8.10.2020 -------------------------------------------------------------------------------- diff --git a/README.rst b/README.rst index aea5b91..7cbd400 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ pyexcel-xls - Let you focus on data, instead of xls format .. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png :target: https://www.patreon.com/chfw -.. image:: https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg +.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel-mobans/master/images/awesome-badge.svg :target: https://awesome-python.com/#specific-formats-processing .. image:: https://travis-ci.org/pyexcel/pyexcel-xls.svg?branch=master @@ -65,6 +65,8 @@ Known constraints Fonts, colors and charts are not supported. +Nor to read password protected xls, xlsx and ods files. + Installation ================================================================================ diff --git a/changelog.yml b/changelog.yml index 27f4d30..485ed34 100644 --- a/changelog.yml +++ b/changelog.yml @@ -1,6 +1,12 @@ name: pyexcel-xls organisation: pyexcel releases: +- changes: + - action: Updated + details: + - "Restrict this library to get installed on python 3.6+, because pyexcel-io 0.6.0+ supports only python 3.6+." + date: 21.10.2020 + version: 0.6.1 - changes: - action: Updated details: diff --git a/docs/source/conf.py b/docs/source/conf.py index 128c99c..1ed7aba 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -24,11 +24,11 @@ DESCRIPTION = ( project = 'pyexcel-xls' copyright = '2015-2020 Onni Software Ltd.' -author = 'chfw' +author = 'C.W.' # The short X.Y version -version = '0.6.0' +version = '0.6.1' # The full version, including alpha/beta/rc tags -release = '0.6.0' +release = '0.6.1' # -- General configuration --------------------------------------------------- diff --git a/lint.sh b/lint.sh index 891aa63..d31eeaa 100644 --- a/lint.sh +++ b/lint.sh @@ -1,2 +1,2 @@ pip install flake8 -flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long . && python setup.py checkdocs +flake8 --exclude=.moban.d,docs,setup.py --builtins=unicode,xrange,long . && python setup.py checkdocs \ No newline at end of file diff --git a/pyexcel-xls.yml b/pyexcel-xls.yml index 484a09a..66e1148 100644 --- a/pyexcel-xls.yml +++ b/pyexcel-xls.yml @@ -1,9 +1,9 @@ overrides: "pyexcel.yaml" name: "pyexcel-xls" nick_name: xls -version: 0.6.0 -current_version: 0.6.0 -release: 0.6.0 +version: 0.6.1 +current_version: 0.6.1 +release: 0.6.1 file_type: xls is_on_conda: true dependencies: @@ -14,3 +14,5 @@ test_dependencies: - pyexcel description: A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format moban_command: false +python_requires: ">=3.6" +min_python_version: "3.6" diff --git a/setup.py b/setup.py index d8cfed2..550fc18 100644 --- a/setup.py +++ b/setup.py @@ -31,8 +31,8 @@ except (ValueError, UnicodeError, locale.Error): locale.setlocale(locale.LC_ALL, "en_US.UTF-8") NAME = "pyexcel-xls" -AUTHOR = "chfw" -VERSION = "0.6.0" +AUTHOR = "C.W." +VERSION = "0.6.1" EMAIL = "info@pyexcel.org" LICENSE = "New BSD" DESCRIPTION = ( @@ -40,7 +40,7 @@ DESCRIPTION = ( "reads xlsx and xlsm format" ) URL = "https://github.com/pyexcel/pyexcel-xls" -DOWNLOAD_URL = "%s/archive/0.6.0.tar.gz" % URL +DOWNLOAD_URL = "%s/archive/0.6.1.tar.gz" % URL FILES = ["README.rst","CONTRIBUTORS.rst", "CHANGELOG.rst"] KEYWORDS = [ "python", @@ -53,11 +53,11 @@ 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 :: Only", + + + "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", @@ -65,6 +65,7 @@ CLASSIFIERS = [ 'Programming Language :: Python :: Implementation :: PyPy' ] +PYTHON_REQUIRES = ">=3.6" INSTALL_REQUIRES = [ "pyexcel-io>=0.5.3", @@ -78,13 +79,14 @@ 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-xls v0.6.0 " + - "Find 0.6.0 in changelog for more details") +HERE = os.path.abspath(os.path.dirname(__file__)) + +GS_COMMAND = ("gease pyexcel-xls v0.6.1 " + + "Find 0.6.1 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__)) class PublishCommand(Command): @@ -130,7 +132,6 @@ SETUP_COMMANDS.update({ "publish": PublishCommand }) - def has_gease(): """ test if github release command is installed @@ -199,6 +200,7 @@ if __name__ == "__main__": long_description=read_files(*FILES), license=LICENSE, keywords=KEYWORDS, + python_requires=PYTHON_REQUIRES, extras_require=EXTRAS_REQUIRE, tests_require=["nose"], install_requires=INSTALL_REQUIRES,