openstack
/
pbr
Code Issues Proposed changes

Merge "Ignore index URL lines in requirements.txt files"

This commit is contained in:
Jenkins 2017-05-20 17:14:56 +00:00 committed by Gerrit Code Review
parent 6fdf4e1086 2a0f2e589c
commit c9a183b2c5
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pbr/packaging.py
View File

@ -102,6 +102,10 @@ def parse_requirements(requirements_files=None, strip_markers=False):
if (not line.strip()) or line.startswith('#'):
continue
# Ignore index URL lines
if re.match(r'^\s*(-i|--index-url|--extra-index-url).*', line):
continue
# Handle nested requirements files such as:
# -r other-requirements.txt
if line.startswith('-r'):

13
pbr/tests/test_packaging.py
View File

@ -486,6 +486,19 @@ class TestPresenceOfGit(base.BaseTestCase):
self.assertEqual(False, git._git_is_installed())
class TestIndexInRequirements(base.BaseTestCase):
def test_index_in_requirement(self):
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')
result = packaging.parse_requirements([requirements])
self.assertEqual([], result)
class TestNestedRequirements(base.BaseTestCase):
def test_nested_requirement(self):