Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setup error when using pip 10 #191

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,19 +117,17 @@ def run(self):

requirements_links = []

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

requirements = pip.req.parse_requirements(
spec, session=pip.download.PipSession())

for item in requirements:
if getattr(item, 'link', None):
requirements_links.append(str(item.link))
if item.req:
requires.append(str(item.req))
with open(filename) as reqs:
for line in reqs.read().splitlines():
if line.startswith('-r '):
requires += requirements(line.split()[1])
elif line.startswith('-e '):
continue
else:
requires.append(line)

return requires

Expand Down Expand Up @@ -166,8 +164,8 @@ def requirements(spec=None):
long_description_markdown_filename='README.md',
use_scm_version={'version_scheme':'guess-next-dev'},
include_package_data = True,
install_requires=requirements(),
tests_require=requirements('test'),
install_requires=requirements('requirements.txt'),
tests_require=requirements('requirements-test.txt'),
dependency_links=requirements_links,
cmdclass={
'buildout': Buildout,
Expand Down