diff options
| author | Sachi King <nakato@nakato.io> | 2015-09-11 17:57:23 +1000 |
|---|---|---|
| committer | Sachi King <nakato@nakato.io> | 2015-09-14 18:26:11 +1000 |
| commit | daa905cad45ea89b557b6468af021270980b9c24 (patch) | |
| tree | 86672612a9d721c50a258eef01aba8c8ddd4dfe7 /pbr/util.py | |
| parent | bcc9b304b8db32bcfa32e52dc3918a95f9f581ab (diff) | |
| download | pbr-daa905cad45ea89b557b6468af021270980b9c24.tar.gz | |
Strip comments present in setup.cfg1.8.0
When processing setup.cfg strip trailing comments from lines as this is
unsupported by setuptools.
Change-Id: I7712c07552b50830549644a6ff4167b90d897125
Closes-bug: 1494330
Diffstat (limited to 'pbr/util.py')
| -rw-r--r-- | pbr/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pbr/util.py b/pbr/util.py index 644bcd8..fffd733 100644 --- a/pbr/util.py +++ b/pbr/util.py @@ -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 = [] |