openstack
/
pbr
Code Issues Proposed changes

Merge "Ignore --find-links in requirements file"

This commit is contained in:
Zuul 2019-01-22 21:04:45 +00:00 committed by Gerrit Code Review
parent a9b31113b7 bc4193b183
commit 7909c7afd3
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pbr/packaging.py
View File

@ -118,7 +118,8 @@ def parse_requirements(requirements_files=None, strip_markers=False):
continue
# Ignore index URL lines
if re.match(r'^\s*(-i|--index-url|--extra-index-url).*', line):
if re.match(r'^\s*(-i|--index-url|--extra-index-url|--find-links).*',
line):
continue
# Handle nested requirements files such as:

10
pbr/tests/test_packaging.py
View File

@ -531,11 +531,13 @@ class ParseRequirementsTest(base.BaseTestCase):
tempdir = tempfile.mkdtemp()
requirements = os.path.join(tempdir, 'requirements.txt')
with open(requirements, 'w') as f:
f.write('-i https://myindex.local')
f.write(' --index-url https://myindex.local')
f.write(' --extra-index-url https://myindex.local')
f.write('-i https://myindex.local\n')
f.write(' --index-url https://myindex.local\n')
f.write(' --extra-index-url https://myindex.local\n')
f.write('--find-links https://myindex.local\n')
f.write('arequirement>=1.0\n')
result = packaging.parse_requirements([requirements])
self.assertEqual([], result)
self.assertEqual(['arequirement>=1.0'], result)
def test_nested_requirements(self):
tempdir = tempfile.mkdtemp()

6
releasenotes/notes/ignore-find-links-07cf54f465aa33a6.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
PBR now ignores ``--find-links`` in requirements files. This option is not
a valid ``install_requires`` entry for setuptools and thus breaks
PBR-based installs.