Skip to content

Commit de4b64e

Browse files
authored
Merge pull request nficano#107 from AndySun25/master
Fixed installation of futures on python3
2 parents b68ed0a + aeba93f commit de4b64e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ boto3==1.4.4
22
botocore==1.5.62
33
click==6.6
44
docutils==0.12
5-
futures==3.0.5
65
jmespath==0.9.0
76
pyaml==15.8.2
87
python-dateutil==2.5.3

setup.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
'requirements.txt', session=pip.download.PipSession(),
1414
)
1515

16+
pip_requirements = [str(r.req) for r in requirements]
17+
1618
# Only install futures package if using a Python version <= 2.7
17-
if sys.version_info[0] == 2:
18-
pip_requirements = [str(r.req) for r in requirements]
19-
else:
20-
pip_requirements = [str(r.req)
21-
for r in requirements if 'futures' not in str(r.req)]
19+
if sys.version_info < (3, 0):
20+
pip_requirements.append('futures')
2221

2322
test_requirements = [
2423
# TODO: put package test requirements here

0 commit comments

Comments
 (0)