Skip to content

Commit 3b95688

Browse files
committed
🥚 🎡 release 0.4.2. related to pyexcel/pyexcel#105
1 parent febda43 commit 3b95688

File tree

7 files changed

+51
-19
lines changed

7 files changed

+51
-19
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
before_install:
1413
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install flake8==2.6.2; fi
1514
- if [[ -f min_requirements.txt && "$MINREQ" -eq 1 ]]; then

CHANGELOG.rst

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

4+
0.5.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.5.1.
11+
#. remove python2.6 test support
12+
#. update its dependecy on pyexcel-io to 0.5.3
13+
414
0.5.1 - 20.10.2017
515
--------------------------------------------------------------------------------
616

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-htmlr'
2222
copyright = u'2015-2017 Onni Software Ltd.'
23-
version = '0.5.1'
24-
release = '0.5.1'
23+
version = '0.5.2'
24+
release = '0.5.2'
2525
exclude_patterns = []
2626
pygments_style = 'sphinx'
2727
html_theme = 'default'

docs/source/index.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ pyexcel developers can cherry pick the plugins for your needs.
2020
Installation
2121
-------------
2222

23-
You can install it via pip:
23+
24+
You can install pyexcel-htmlr via pip:
2425

2526
.. code-block:: bash
2627

pyexcel-htmlr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
overrides: "pyexcel.yaml"
22
name: "pyexcel-htmlr"
33
nick_name: "htmlr"
4-
version: "0.5.1"
5-
current_version: "0.5.1"
6-
release: "0.5.1"
4+
version: "0.5.2"
5+
current_version: "0.5.2"
6+
release: "0.5.2"
77
file_type: 'html'
88
dependencies:
99
- html5lib
1010
- lxml
11-
- pyexcel-io>=0.5.0
11+
- pyexcel-io>=0.5.3
1212
description: "read tables in html file as excel data"

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
html5lib
22
lxml
3-
pyexcel-io>=0.5.0
3+
pyexcel-io>=0.5.3

setup.py

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
NAME = 'pyexcel-htmlr'
1111
AUTHOR = 'C.W.'
12-
VERSION = '0.5.1'
12+
VERSION = '0.5.2'
1313
1414
LICENSE = 'New BSD'
1515
DESCRIPTION = (
1616
'read tables in html file as excel data' +
1717
''
1818
)
1919
URL = 'https://github.com/pyexcel/pyexcel-htmlr'
20-
DOWNLOAD_URL = '%s/archive/0.5.1.tar.gz' % URL
20+
DOWNLOAD_URL = '%s/archive/0.5.2.tar.gz' % URL
2121
FILES = ['README.rst', 'CHANGELOG.rst']
2222
KEYWORDS = [
2323
'python'
@@ -41,18 +41,22 @@
4141
INSTALL_REQUIRES = [
4242
'html5lib',
4343
'lxml',
44-
'pyexcel-io>=0.5.0',
44+
'pyexcel-io>=0.5.3',
4545
]
4646

4747

4848
PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
4949
EXTRAS_REQUIRE = {
5050
}
51+
# You do not need to read beyond this line
5152
PUBLISH_COMMAND = '{0} setup.py sdist bdist_wheel upload -r pypi'.format(
5253
sys.executable)
53-
GS_COMMAND = ('gs pyexcel-htmlr v0.5.1 ' +
54-
"Find 0.5.1 in changelog for more details")
55-
here = os.path.abspath(os.path.dirname(__file__))
54+
GS_COMMAND = ('gs pyexcel-htmlr v0.5.2 ' +
55+
"Find 0.5.2 in changelog for more details")
56+
NO_GS_MESSAGE = ('Automatic github release is disabled. ' +
57+
'Please install gease to enable it.')
58+
UPLOAD_FAILED_MSG = ('Upload failed. please run "%s" yourself.')
59+
HERE = os.path.abspath(os.path.dirname(__file__))
5660

5761

5862
class PublishCommand(Command):
@@ -75,17 +79,36 @@ def finalize_options(self):
7579
def run(self):
7680
try:
7781
self.status('Removing previous builds...')
78-
rmtree(os.path.join(here, 'dist'))
82+
rmtree(os.path.join(HERE, 'dist'))
7983
except OSError:
8084
pass
8185

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

8696
sys.exit()
8797

8898

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

0 commit comments

Comments
 (0)