Skip to content

Commit 6071bde

Browse files
committed
🥚 🎡 release 0.4.2. related to pyexcel/pyexcel#105
1 parent b1dd01a commit 6071bde

File tree

6 files changed

+57
-17
lines changed

6 files changed

+57
-17
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ python:
99
- 3.4
1010
- 3.3
1111
- 2.7
12-
- 2.6
1312
matrix:
1413
include:
1514
- python: 2.7

CHANGELOG.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
Change log
22
================================================================================
33

4+
0.4.2 - 23.10.2017
5+
--------------------------------------------------------------------------------
6+
7+
updated
8+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9+
#. pyexcel `#105 <https://github.com/pyexcel/pyexcel/issues/105>`_, remove gease
10+
from setup_requires, introduced by 0.4.1.
11+
#. remove python2.6 test support
12+
13+
0.4.1 - 20.10.2017
14+
--------------------------------------------------------------------------------
15+
16+
added
17+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
18+
19+
#. `#103 <https://github.com/pyexcel/pyexcel/issues/103>`_, include LICENSE file
20+
in MANIFEST.in, meaning LICENSE file will appear in the released tar ball.
21+
422
0.4.0 - 19.06.2017
523
--------------------------------------------------------------------------------
624

README.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Fonts, colors and charts are not supported.
2727
Installation
2828
================================================================================
2929

30-
You can install it via pip:
30+
31+
You can install pyexcel-xlsxw via pip:
3132

3233
.. code-block:: bash
3334
@@ -50,7 +51,7 @@ product, please `support me on patreon <https://www.patreon.com/bePatron?u=55376
5051
maintain the project and develop it further.
5152

5253
If you are an individual, you are welcome to support me too on patreon and for however long
53-
you feel like to. As a patreon, you will receive
54+
you feel like. As a patreon, you will receive
5455
`early access to pyexcel related contents <https://www.patreon.com/pyexcel/posts>`_.
5556

5657
With your financial support, I will be able to invest

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
project = u'pyexcel-xlsxw'
2222
copyright = u'2015-2017 Onni Software Ltd.'
23-
version = '0.4.1'
24-
release = '0.4.1'
23+
version = '0.4.2'
24+
release = '0.4.2'
2525
exclude_patterns = []
2626
pygments_style = 'sphinx'
2727
html_theme = 'default'

pyexcel_xlsxw.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-xlsxw"
33
nick_name: xlsxw
4-
version: 0.4.1
5-
current_version: 0.4.1
6-
release: 0.4.1
4+
version: 0.4.2
5+
current_version: 0.4.2
6+
release: 0.4.2
77
file_type: xlsx
88
dependencies:
99
- XlsxWriter==0.9.3

setup.py

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
NAME = 'pyexcel-xlsxw'
99
AUTHOR = 'C.W.'
10-
VERSION = '0.4.1'
10+
VERSION = '0.4.2'
1111
EMAIL = 'wangc_2011@hotmail.com'
1212
LICENSE = 'New BSD'
1313
DESCRIPTION = (
1414
'A wrapper library to write data in xlsx and xlsm format' +
1515
''
1616
)
1717
URL = 'https://github.com/pyexcel/pyexcel-xlsxw'
18-
DOWNLOAD_URL = '%s/archive/0.4.1.tar.gz' % URL
18+
DOWNLOAD_URL = '%s/archive/0.4.2.tar.gz' % URL
1919
FILES = ['README.rst', 'CHANGELOG.rst']
2020
KEYWORDS = [
2121
'xlsx'
@@ -47,11 +47,15 @@
4747
PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
4848
EXTRAS_REQUIRE = {
4949
}
50+
# You do not need to read beyond this line
5051
PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format(
5152
sys.executable)
52-
GS_COMMAND = ('gs pyexcel-xlsxw v0.4.1 ' +
53-
"Find 0.4.1 in changelog for more details")
54-
here = os.path.abspath(os.path.dirname(__file__))
53+
GS_COMMAND = ('gs pyexcel-xlsxw v0.4.2 ' +
54+
"Find 0.4.2 in changelog for more details")
55+
NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
56+
'Please install gease to enable it.')
57+
UPLOAD_FAILED_MSG = ('Upload failed. please run "%s" yourself.')
58+
HERE = os.path.abspath(os.path.dirname(__file__))
5559

5660

5761
class PublishCommand(Command):
@@ -74,17 +78,36 @@ def finalize_options(self):
7478
def run(self):
7579
try:
7680
self.status('Removing previous builds...')
77-
rmtree(os.path.join(here, 'dist'))
81+
rmtree(os.path.join(HERE, 'dist'))
7882
except OSError:
7983
pass
8084

8185
self.status('Building Source and Wheel (universal) distribution...')
82-
if os.system(GS_COMMAND) == 0:
83-
os.system(PUBLISH_COMMAND)
86+
run_status = True
87+
if has_gease():
88+
run_status = os.system(GS_COMMAND) == 0
89+
else:
90+
self.status(NO_GS_MESSAGE)
91+
if run_status:
92+
if os.system(PUBLISH_COMMAND) != 0:
93+
self.status(UPLOAD_FAILED_MSG % PUBLISH_COMMAND)
8494

8595
sys.exit()
8696

8797

98+
def has_gease():
99+
"""
100+
test if github release command is installed
101+
102+
visit http://github.com/moremoban/gease for more info
103+
"""
104+
try:
105+
import gease # noqa
106+
return True
107+
except ImportError:
108+
return False
109+
110+
88111
def read_files(*files):
89112
"""Read files into setup"""
90113
text = ""
@@ -145,7 +168,6 @@ def filter_out_test_code(file_handle):
145168
include_package_data=True,
146169
zip_safe=False,
147170
classifiers=CLASSIFIERS,
148-
setup_requires=['gease'],
149171
cmdclass={
150172
'publish': PublishCommand,
151173
}

0 commit comments

Comments
 (0)