diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 50a78e1..22c0b69 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 961252e..c7e39f6 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,8 @@ Fonts, colors and charts are not supported. Installation ================================================================================ -You can install it via pip: + +You can install pyexcel-ods3 via pip: .. code-block:: bash @@ -53,7 +54,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 7a18696..8e985f1 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -20,8 +20,8 @@ project = u'pyexcel-ods3' 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_ods3.yaml b/pyexcel_ods3.yaml index 31f7c1a..593637c 100644 --- a/pyexcel_ods3.yaml +++ b/pyexcel_ods3.yaml @@ -1,12 +1,12 @@ overrides: "pyexcel.yaml" name: "pyexcel-ods3" nick_name: ods3 -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: ods dependencies: - - pyexcel-io>=0.5.0 + - pyexcel-io>=0.5.3 - lxml - pyexcel-ezodf>=0.3.3 - weakrefset;python_version<"2.7" diff --git a/requirements.txt b/requirements.txt index 8f2a0a2..a37bdcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -pyexcel-io>=0.5.0 +pyexcel-io>=0.5.3 lxml pyexcel-ezodf>=0.3.3 weakrefset;python_version<"2.7" diff --git a/setup.py b/setup.py index a8b6f9f..e534fc3 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ NAME = 'pyexcel-ods3' AUTHOR = 'C.W.' -VERSION = '0.5.1' +VERSION = '0.5.2' EMAIL = 'wangc_2011@hotmail.com' LICENSE = 'New BSD' DESCRIPTION = ( @@ -17,7 +17,7 @@ '' ) URL = 'https://github.com/pyexcel/pyexcel-ods3' -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 = [ 'ods' @@ -39,7 +39,7 @@ ] INSTALL_REQUIRES = [ - 'pyexcel-io>=0.5.0', + 'pyexcel-io>=0.5.3', 'lxml', 'pyexcel-ezodf>=0.3.3', ] @@ -50,11 +50,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-ods3 v0.5.1 ' + - "Find 0.5.1 in changelog for more details") -here = os.path.abspath(os.path.dirname(__file__)) +GS_COMMAND = ('gs pyexcel-ods3 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): @@ -77,17 +81,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 = "" @@ -148,7 +171,6 @@ def filter_out_test_code(file_handle): include_package_data=True, zip_safe=False, classifiers=CLASSIFIERS, - setup_requires=['gease'], cmdclass={ 'publish': PublishCommand, }