summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pbr/tests/test_packaging.py4
-rw-r--r--pbr/tests/test_util.py2
-rw-r--r--pbr/util.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py
index 81701d1..c6b2e7d 100644
--- a/pbr/tests/test_packaging.py
+++ b/pbr/tests/test_packaging.py
@@ -454,8 +454,8 @@ class TestRequirementParsing(base.BaseTestCase):
# anonymous section instead of the empty string. Weird.
expected_requirements = {
None: ['bar'],
- ":python_version=='2.6'": ['quux<1.0'],
- "test:python_version=='2.7'": ['baz>3.2'],
+ ":(python_version=='2.6')": ['quux<1.0'],
+ "test:(python_version=='2.7')": ['baz>3.2'],
"test": ['foo']
}
setup_py = os.path.join(tempdir, 'setup.py')
diff --git a/pbr/tests/test_util.py b/pbr/tests/test_util.py
index 7a4c6bd..5999b17 100644
--- a/pbr/tests/test_util.py
+++ b/pbr/tests/test_util.py
@@ -48,7 +48,7 @@ class TestExtrasRequireParsingScenarios(base.BaseTestCase):
baz<1.6 :python_version=='2.6'
""",
'expected_extra_requires': {
- "test:python_version=='2.6'": ['foo', 'baz<1.6'],
+ "test:(python_version=='2.6')": ['foo', 'baz<1.6'],
"test": ['bar']}}),
('no_extras', {
'config_text': """
diff --git a/pbr/util.py b/pbr/util.py
index 929a234..644bcd8 100644
--- a/pbr/util.py
+++ b/pbr/util.py
@@ -418,7 +418,7 @@ def setup_cfg_to_setup_kwargs(config):
for req_group in all_requirements:
for requirement, env_marker in all_requirements[req_group]:
if env_marker:
- extras_key = '%s:%s' % (req_group, env_marker)
+ extras_key = '%s:(%s)' % (req_group, env_marker)
else:
extras_key = req_group
extras_require.setdefault(extras_key, []).append(requirement)