diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-04-04 16:27:32 +1000 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-04-05 16:50:48 +1000 |
| commit | 1cdd940877e158f2b748f67f09d1f1321a113998 (patch) | |
| tree | 351c75d2535d47ab2347641de42a6a4b38b99d6b /setuptools/tests/test_egg_info.py | |
| parent | 9803058dc72867605bdac20d41249c00e8eae415 (diff) | |
| download | python-setuptools-git-1cdd940877e158f2b748f67f09d1f1321a113998.tar.gz | |
Restore evaluating environment markers in WorkingSet
Correctly deal with parsed requirements that include extras as a
marker inside WorkingSet that are populated from METADATA inside
wheels, like we get from pip>=7.
This partially reverts commit 04d10ff025e1cbef7ec93a2008c930e856045c8a.
Closes: #523
Diffstat (limited to 'setuptools/tests/test_egg_info.py')
| -rw-r--r-- | setuptools/tests/test_egg_info.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py index d37567b4..fd5f26fc 100644 --- a/setuptools/tests/test_egg_info.py +++ b/setuptools/tests/test_egg_info.py @@ -104,7 +104,6 @@ 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'"],""") @@ -115,14 +114,12 @@ 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'"],""") |