From c3b6c6580a7e1903a784c38e9e2e9689c349b16f Mon Sep 17 00:00:00 2001 From: chfw Date: Mon, 23 Oct 2017 18:39:36 +0100 Subject: [PATCH] :egg: :ferris_wheel: release 0.5.2. related to https://github.com/pyexcel/pyexcel/issues/105 --- .travis.yml | 1 - CHANGELOG.rst | 10 ++++++++++ README.rst | 5 +++-- docs/source/conf.py | 4 ++-- pyexcel_xls.yaml | 8 ++++---- requirements.txt | 2 +- setup.py | 42 ++++++++++++++++++++++++++++++++---------- 7 files changed, 52 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a38bf0..3805bcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ python: - 3.4 - 3.3 - 2.7 - - 2.6 matrix: include: - python: 2.7 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 798ef82..f5a7b2c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,16 @@ Change log ================================================================================ +0.5.2 - 23.10.2017 +-------------------------------------------------------------------------------- + +updated +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +#. pyexcel `#105 `_, remove gease + from setup_requires, introduced by 0.5.1. +#. remove python2.6 test support +#. update its dependecy on pyexcel-io to 0.5.3 + 0.5.1 - 20.10.2017 -------------------------------------------------------------------------------- diff --git a/README.rst b/README.rst index debaced..1e35e9d 100644 --- a/README.rst +++ b/README.rst @@ -25,7 +25,8 @@ Fonts, colors and charts are not supported. Installation ================================================================================ -You can install it via pip: + +You can install pyexcel-xls via pip: .. code-block:: bash @@ -48,7 +49,7 @@ product, please `support me on patreon `_. With your financial support, I will be able to invest diff --git a/docs/source/conf.py b/docs/source/conf.py index 548dc4c..4428e91 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -21,8 +21,8 @@ project = u'pyexcel-xls' copyright = u'2015-2017 Onni Software Ltd.' -version = '0.5.1' -release = '0.5.1' +version = '0.5.2' +release = '0.5.2' exclude_patterns = [] pygments_style = 'sphinx' html_theme = 'default' diff --git a/pyexcel_xls.yaml b/pyexcel_xls.yaml index 343ad87..3b6ad15 100644 --- a/pyexcel_xls.yaml +++ b/pyexcel_xls.yaml @@ -1,12 +1,12 @@ overrides: "pyexcel.yaml" name: "pyexcel-xls" nick_name: xls -version: 0.5.1 -current_version: 0.5.1 -release: 0.5.1 +version: 0.5.2 +current_version: 0.5.2 +release: 0.5.2 file_type: xls dependencies: - - pyexcel-io>=0.5.0 + - pyexcel-io>=0.5.3 - xlrd - xlwt description: A wrapper library to read, manipulate and write data in xls format. It reads xlsx and xlsm format diff --git a/requirements.txt b/requirements.txt index 3f33157..cc6ba29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -pyexcel-io>=0.5.0 +pyexcel-io>=0.5.3 xlrd xlwt diff --git a/setup.py b/setup.py index da78df6..185d2a9 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ NAME = 'pyexcel-xls' AUTHOR = 'C.W.' -VERSION = '0.5.1' +VERSION = '0.5.2' EMAIL = 'wangc_2011@hotmail.com' LICENSE = 'New BSD' DESCRIPTION = ( @@ -18,7 +18,7 @@ '' ) URL = 'https://github.com/pyexcel/pyexcel-xls' -DOWNLOAD_URL = '%s/archive/0.5.1.tar.gz' % URL +DOWNLOAD_URL = '%s/archive/0.5.2.tar.gz' % URL FILES = ['README.rst', 'CHANGELOG.rst'] KEYWORDS = [ 'xls', @@ -43,7 +43,7 @@ ] INSTALL_REQUIRES = [ - 'pyexcel-io>=0.5.0', + 'pyexcel-io>=0.5.3', 'xlrd', 'xlwt', ] @@ -52,11 +52,15 @@ 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-xls v0.5.1 ' + - "Find 0.5.1 in changelog for more details") -here = os.path.abspath(os.path.dirname(__file__)) +GS_COMMAND = ('gs pyexcel-xls v0.5.2 ' + + "Find 0.5.2 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.') +HERE = os.path.abspath(os.path.dirname(__file__)) class PublishCommand(Command): @@ -79,17 +83,36 @@ def finalize_options(self): def run(self): try: self.status('Removing previous builds...') - rmtree(os.path.join(here, 'dist')) + rmtree(os.path.join(HERE, 'dist')) except OSError: pass self.status('Building Source and Wheel (universal) distribution...') - if os.system(GS_COMMAND) == 0: - os.system(PUBLISH_COMMAND) + 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) sys.exit() +def has_gease(): + """ + test if github release command is installed + + visit http://github.com/moremoban/gease for more info + """ + try: + import gease # noqa + return True + except ImportError: + return False + + def read_files(*files): """Read files into setup""" text = "" @@ -150,7 +173,6 @@ def filter_out_test_code(file_handle): include_package_data=True, zip_safe=False, classifiers=CLASSIFIERS, - setup_requires=['gease'], cmdclass={ 'publish': PublishCommand, }