From 30082bc9a94614bf6c42c25d6b688493b799871c Mon Sep 17 00:00:00 2001 From: Matias Kreder Date: Sat, 4 Jul 2015 11:55:28 -0300 Subject: [PATCH 1/3] fixed dependency problem, on python 3.4.0 pathlib is included in the python distribution so it must not be included in the requirements for thefuck otherwise it wont run at startup --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1b526838..1352b9c6 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,13 @@ from setuptools import setup, find_packages +import sys VERSION = '1.46' +deps = ['psutil', 'colorama', 'six'] + +if sys.version_info < (3,4): + deps.append('pathlib') setup(name='thefuck', version=VERSION, @@ -15,7 +20,7 @@ setup(name='thefuck', 'tests', 'release']), include_package_data=True, zip_safe=False, - install_requires=['pathlib', 'psutil', 'colorama', 'six'], + install_requires=deps, entry_points={'console_scripts': [ 'thefuck = thefuck.main:main', 'thefuck-alias = thefuck.shells:app_alias']}) From a75c99eb12ce3c68c07a7a3ed7ed4090a9d30e79 Mon Sep 17 00:00:00 2001 From: Matias Kreder Date: Sat, 4 Jul 2015 12:24:09 -0300 Subject: [PATCH 2/3] change deps to install_requires --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 1352b9c6..6c820ed7 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import sys VERSION = '1.46' -deps = ['psutil', 'colorama', 'six'] +install_requires = ['psutil', 'colorama', 'six'] if sys.version_info < (3,4): deps.append('pathlib') @@ -20,7 +20,7 @@ setup(name='thefuck', 'tests', 'release']), include_package_data=True, zip_safe=False, - install_requires=deps, + install_requires=install_requires, entry_points={'console_scripts': [ 'thefuck = thefuck.main:main', 'thefuck-alias = thefuck.shells:app_alias']}) From 18ea4272abbcc07380a988022e71635efd7413a9 Mon Sep 17 00:00:00 2001 From: Matias Kreder Date: Sat, 4 Jul 2015 12:26:56 -0300 Subject: [PATCH 3/3] change deps to install_requires #2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6c820ed7..7f4364a1 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ VERSION = '1.46' install_requires = ['psutil', 'colorama', 'six'] if sys.version_info < (3,4): - deps.append('pathlib') + install_requires.append('pathlib') setup(name='thefuck', version=VERSION,