openstack
/
pbr
Code Issues Proposed changes

Strip comments present in setup.cfg 

When processing setup.cfg strip trailing comments from lines as this is
unsupported by setuptools.

Change-Id: I7712c07552b50830549644a6ff4167b90d897125
Closes-bug: 1494330
This commit is contained in:
Sachi King 2015-09-11 17:57:23 +10:00
parent bcc9b304b8
commit daa905cad4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pbr/tests/test_packaging.py
View File

@ -479,7 +479,8 @@ class TestRequirementParsing(base.BaseTestCase):
[extras]
test =
foo
baz>3.2 :python_version=='2.7'
baz>3.2 :python_version=='2.7' # MIT
bar>3.3 :python_version=='2.7' # MIT # Apache
""")))
# pkg_resources.split_sections uses None as the title of an
# anonymous section instead of the empty string. Weird.
@ -489,7 +490,7 @@ class TestRequirementParsing(base.BaseTestCase):
":(python_version=='2.7')": ['Routes>=1.12.3,!=2.0,!=2.1',
'requests-kerberos>=0.6'],
'test': ['foo'],
"test:(python_version=='2.7')": ['baz>3.2']
"test:(python_version=='2.7')": ['baz>3.2', 'bar>3.3']
}
setup_py = os.path.join(tempdir, 'setup.py')

4
pbr/util.py
View File

@ -334,7 +334,7 @@ def setup_cfg_to_setup_kwargs(config):
# Split install_requires into package,env_marker tuples
# These will be re-assembled later
install_requires = []
requirement_pattern = '(?P<package>[^;]*);?(?P<env_marker>.*)$'
requirement_pattern = '(?P<package>[^;]*);?(?P<env_marker>[^#]*?)(?:\s*#.*)?$'
for requirement in in_cfg_value:
m = re.match(requirement_pattern, requirement)
requirement_package = m.group('package').strip()
@ -394,7 +394,7 @@ def setup_cfg_to_setup_kwargs(config):
# -> {'fred': ['bar'], 'fred:marker':['foo']}
if 'extras' in config:
requirement_pattern = '(?P<package>[^:]*):?(?P<env_marker>.*)$'
requirement_pattern = '(?P<package>[^:]*):?(?P<env_marker>[^#]*?)(?:\s*#.*)?$'
extras = config['extras']
for extra in extras:
extra_requirements = []