Skip to content

Commit

Permalink
Fix setup for pip > 9
Browse files Browse the repository at this point in the history
  • Loading branch information
aschampion committed May 29, 2018
1 parent b967225 commit ce9d043
Showing 1 changed file with 7 additions and 14 deletions.
21 changes: 7 additions & 14 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@


import pip
from pip.req import parse_requirements
from setuptools import setup


Expand All @@ -14,19 +13,13 @@
history = history_file.read()


parsed_requirements = parse_requirements(
'requirements/prod.txt',
session=pip.download.PipSession()
)

parsed_test_requirements = parse_requirements(
'requirements/test.txt',
session=pip.download.PipSession()
)
def parse_requirements(filename):
lines = (line.strip() for line in open(filename))
return [line for line in lines if line and not line.startswith('#')]


requirements = [str(ir.req) for ir in parsed_requirements]
test_requirements = [str(tr.req) for tr in parsed_test_requirements]
parsed_requirements = parse_requirements('requirements/prod.txt')
parsed_test_requirements = parse_requirements('requirements/test.txt')


setup(
Expand All @@ -48,7 +41,7 @@
]
},
include_package_data=True,
install_requires=requirements,
install_requires=parsed_requirements,
license="MIT license",
zip_safe=False,
keywords='diluvian',
Expand All @@ -63,5 +56,5 @@
],
setup_requires=['pytest-runner',],
test_suite='tests',
tests_require=test_requirements
tests_require=parsed_test_requirements
)

0 comments on commit ce9d043

Please sign in to comment.