Skip to content

Commit e516f84

Browse files
committed
👍 Merge branch 'devel' ; Version Bump to 🔖 v1.7.1
* Fixes issue #31: issue installing with python2 * Fixes issue with github3.py uritemplate rename * Improved packaging and added wheel build support Signed-off-by: Guyzmo <[email protected]>
2 parents 0b4a9fc + d257205 commit e516f84

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ addons:
99
- pandoc
1010
# command to install dependencies
1111
install:
12+
- "pip install --upgrade pip" # upgrade to latest pip (needed on py3.4)
1213
- "pip install zc.buildout"
1314
- "buildout"
1415
# command to run tests

MANIFEST.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
include README.md
2+
include VERSION
3+
include LICENSE
4+
include requirements.txt
5+
6+
global-exclude __pycache__ *.pyc

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.0
1+
1.7.1

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ docopt
22
GitPython==2.0.6
33
progress==1.2
44
python-gitlab==0.13
5+
uritemplate.py==2.0.0
56
github3.py==0.9.5
67
bitbucket-api==0.5.0

setup.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ def info(cls):
6363
def __str__(cls):
6464
return '.'.join(map(str, cls.info))
6565

66+
# Hack for metaclass support in both Py2 and Py3
67+
class VersionInfo_metaclass(VersionInfo):
68+
def __new__(cls, *bases):
69+
return VersionInfo('version_info', bases, {})
6670

67-
class Version(Command, metaclass=VersionInfo):
71+
class Version(VersionInfo_metaclass(Command)):
6872
description = 'Bump version number'
6973
user_options = [
7074
('major', 'M', 'Bump major part of version number'),
@@ -213,7 +217,8 @@ def requirements(spec=None):
213217
author='Bernard `Guyzmo` Pratz',
214218
author_email='[email protected]',
215219
setup_requires=[
216-
'setuptools-markdown'
220+
'setuptools-markdown',
221+
'wheel>=0.25.0'
217222
],
218223
long_description_markdown_filename='README.md',
219224
include_package_data = True,

0 commit comments

Comments
 (0)