From 51c37bc5abf18adc69ba1a94e8bfbf57891764d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tich=C3=BD?= Date: Fri, 17 Jul 2015 18:37:49 +0200 Subject: [PATCH] Fix wheel dependencies for Python 2 --- .travis.yml | 2 +- requirements.txt | 1 + setup.py | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c14b697a..b00823a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,6 @@ python: - "3.3" - "2.7" install: - - python setup.py develop - pip install -r requirements.txt + - python setup.py develop script: py.test -v diff --git a/requirements.txt b/requirements.txt index 78b43ee1..3e46cdce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ pytest mock pytest-mock wheel +setuptools>=17.1 diff --git a/setup.py b/setup.py index be0d803b..86673108 100755 --- a/setup.py +++ b/setup.py @@ -11,12 +11,10 @@ elif (3, 0) < sys.version_info < (3, 3): ' ({}.{} detected).'.format(*sys.version_info[:2])) sys.exit(-1) -VERSION = '1.49' +VERSION = '1.49.1' install_requires = ['psutil', 'colorama', 'six'] - -if sys.version_info < (3, 4): - install_requires.append('pathlib') +extras_require = {':python_version<"3.4"': ['pathlib']} setup(name='thefuck', version=VERSION, @@ -30,6 +28,7 @@ setup(name='thefuck', include_package_data=True, zip_safe=False, install_requires=install_requires, + extras_require=extras_require, entry_points={'console_scripts': [ 'thefuck = thefuck.main:main', 'thefuck-alias = thefuck.shells:app_alias']})