Skip to content

Commit c32a289

Browse files
committed
Fix setup error when using pip 10
This changes setup.py, so it does not rely on pip internals to form the list of install requires.
1 parent 2974c3f commit c32a289

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

setup.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,17 @@ def run(self):
117117

118118
requirements_links = []
119119

120-
def requirements(spec=None):
121-
spec = '{}{}.txt'.format('requirements',
122-
'-'+spec if spec else '')
120+
def requirements(filename):
123121
requires = []
124122

125-
requirements = pip.req.parse_requirements(
126-
spec, session=pip.download.PipSession())
127-
128-
for item in requirements:
129-
if getattr(item, 'link', None):
130-
requirements_links.append(str(item.link))
131-
if item.req:
132-
requires.append(str(item.req))
123+
with open(filename) as reqs:
124+
for line in reqs.read().splitlines():
125+
if line.startswith('-r '):
126+
requires += requirements(line.split()[1])
127+
elif line.startswith('-e '):
128+
continue
129+
else:
130+
requires.append(line)
133131

134132
return requires
135133

@@ -166,8 +164,8 @@ def requirements(spec=None):
166164
long_description_markdown_filename='README.md',
167165
use_scm_version={'version_scheme':'guess-next-dev'},
168166
include_package_data = True,
169-
install_requires=requirements(),
170-
tests_require=requirements('test'),
167+
install_requires=requirements('requirements.txt'),
168+
tests_require=requirements('requirements-test.txt'),
171169
dependency_links=requirements_links,
172170
cmdclass={
173171
'buildout': Buildout,

0 commit comments

Comments
 (0)