Commit 04d10ff0 authored by Jason R. Coombs's avatar Jason R. Coombs

Bypass environment marker evaluation in requirements resolution. Ref #523.

parent e7a27ca0
......@@ -2,6 +2,12 @@
CHANGES
=======
v20.6.7
-------
* Issue #523: Disabled support for environment markers
introduced in v20.5.
v20.6.6
-------
......
......@@ -804,8 +804,10 @@ class WorkingSet(object):
continue
# If the req has a marker, evaluate it -- skipping the req if
# it evaluates to False.
if req.marker and not req.marker.evaluate():
continue
# https://github.com/pypa/setuptools/issues/523
_issue_523_bypass = True
if not _issue_523_bypass and req.marker and not req.marker.evaluate():
continue
dist = best.get(req.key)
if dist is None:
# Find the best distribution and add it to the map
......
......@@ -182,6 +182,7 @@ class TestDistro:
msg = 'Foo 0.9 is installed but Foo==1.2 is required'
assert vc.value.report() == msg
@pytest.mark.xfail(reason="Functionality disabled; see #523")
def test_environment_markers(self):
"""
Environment markers are evaluated at resolution time.
......
......@@ -104,6 +104,7 @@ class TestEggInfo(object):
'setup.py': setup_script,
})
@pytest.mark.xfail(reason="Functionality disabled; see #523")
def test_install_requires_with_markers(self, tmpdir_cwd, env):
self._setup_script_with_requires(
"""install_requires=["barbazquux;python_version<'2'"],""")
......@@ -114,12 +115,14 @@ class TestEggInfo(object):
requires_txt).read().split('\n')
assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
@pytest.mark.xfail(reason="Functionality disabled; see #523")
def test_setup_requires_with_markers(self, tmpdir_cwd, env):
self._setup_script_with_requires(
"""setup_requires=["barbazquux;python_version<'2'"],""")
self._run_install_command(tmpdir_cwd, env)
assert glob.glob(os.path.join(env.paths['lib'], 'barbazquux*')) == []
@pytest.mark.xfail(reason="Functionality disabled; see #523")
def test_tests_require_with_markers(self, tmpdir_cwd, env):
self._setup_script_with_requires(
"""tests_require=["barbazquux;python_version<'2'"],""")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment