summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst9
-rw-r--r--README.rst5
-rw-r--r--docs/source/conf.py4
-rw-r--r--pyexcel_ods.yaml8
-rw-r--r--requirements.txt2
-rw-r--r--setup.py46
6 files changed, 53 insertions, 21 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 47196b4..114af9b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,15 @@
Change log
================================================================================
+0.5.2 - 23.10.2017
+--------------------------------------------------------------------------------
+
+updated
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#. pyexcel `#105 <https://github.com/pyexcel/pyexcel/issues/105>`_, remove gease
+ from setup_requires, introduced by 0.5.1.
+#. remove python2.6 test support
+
0.5.1 - 20.10.2017
--------------------------------------------------------------------------------
diff --git a/README.rst b/README.rst
index 9beea66..c319864 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-ods via pip:
.. code-block:: bash
@@ -53,7 +54,7 @@ product, please `support me on patreon <https://www.patreon.com/bePatron?u=55376
maintain the project and develop it further.
If you are an individual, you are welcome to support me too on patreon and for however long
-you feel like to. As a patreon, you will receive
+you feel like. As a patreon, you will receive
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
With your financial support, I will be able to invest
diff --git a/docs/source/conf.py b/docs/source/conf.py
index fed1d80..ffdfa2b 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -20,8 +20,8 @@ master_doc = 'index'
project = u'pyexcel-ods'
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_ods.yaml b/pyexcel_ods.yaml
index 33358f0..5136e84 100644
--- a/pyexcel_ods.yaml
+++ b/pyexcel_ods.yaml
@@ -1,11 +1,11 @@
overrides: "pyexcel.yaml"
name: "pyexcel-ods"
nick_name: ods
-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
- odfpy>=1.3.3
description: A wrapper library to read, manipulate and write data in ods format
diff --git a/requirements.txt b/requirements.txt
index 9ffd1b6..61e8b85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-pyexcel-io>=0.5.0
+pyexcel-io>=0.5.3
odfpy>=1.3.3
diff --git a/setup.py b/setup.py
index 694a50f..ff55dd0 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages, Command
NAME = 'pyexcel-ods'
AUTHOR = 'C.W.'
-VERSION = '0.5.1'
+VERSION = '0.5.2'
EMAIL = 'wangc_2011@hotmail.com'
LICENSE = 'New BSD'
DESCRIPTION = (
@@ -15,7 +15,7 @@ DESCRIPTION = (
''
)
URL = 'https://github.com/pyexcel/pyexcel-ods'
-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 = [
'python'
@@ -36,7 +36,7 @@ CLASSIFIERS = [
]
INSTALL_REQUIRES = [
- 'pyexcel-io>=0.5.0',
+ 'pyexcel-io>=0.5.3',
'odfpy>=1.3.3',
]
@@ -44,11 +44,15 @@ INSTALL_REQUIRES = [
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-ods v0.5.1 ' +
- "Find 0.5.1 in changelog for more details")
-here = os.path.abspath(os.path.dirname(__file__))
+GS_COMMAND = ('gs pyexcel-ods 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):
@@ -70,18 +74,37 @@ class PublishCommand(Command):
def run(self):
try:
- self.status('Removing previous builds…')
- rmtree(os.path.join(here, 'dist'))
+ self.status('Removing previous builds...')
+ 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)
+ 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)
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 = ""
@@ -142,7 +165,6 @@ if __name__ == '__main__':
include_package_data=True,
zip_safe=False,
classifiers=CLASSIFIERS,
- setup_requires=['gease'],
cmdclass={
'publish': PublishCommand,
}