aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests
diff options
context:
space:
mode:
authoridle sign <idlesign@yandex.ru>2016-12-01 20:41:46 +0700
committeridle sign <idlesign@yandex.ru>2016-12-01 20:41:46 +0700
commitef583b282b179d46b9e9066e5714d1d37aeaff3b (patch)
tree0b93f681a3be29fe6f7f3b5b5ef07492f9ce8e8e /setuptools/tests
parentcf7bb33406be4ea38c85e80d727ca74b8bc15967 (diff)
parenta83ae992278916ade263379f2d7adc56a4539ff4 (diff)
downloadexternal_python_setuptools-ef583b282b179d46b9e9066e5714d1d37aeaff3b.tar.gz
external_python_setuptools-ef583b282b179d46b9e9066e5714d1d37aeaff3b.tar.bz2
external_python_setuptools-ef583b282b179d46b9e9066e5714d1d37aeaff3b.zip
Merge branch 'remote_pypa_master' into feat/setupcfg_handling
Diffstat (limited to 'setuptools/tests')
-rw-r--r--setuptools/tests/test_namespaces.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 21fd69e7..2d44ad86 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -13,7 +13,7 @@ class TestNamespaces:
@pytest.mark.xfail(sys.version_info < (3, 3),
reason="Requires PEP 420")
- @pytest.mark.skipif('os.environ.get("APPVEYOR")',
+ @pytest.mark.skipif(os.environ.get("APPVEYOR"),
reason="https://github.com/pypa/setuptools/issues/851")
def test_mixed_site_and_non_site(self, tmpdir):
"""