diff --git a/setup.cfg b/setup.cfg index 42358c53e..04f5c306d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -61,7 +61,7 @@ virtualenv.activate = batch = virtualenv.activation.batch:BatchActivator fish = virtualenv.activation.fish:FishActivator powershell = virtualenv.activation.powershell:PowerShellActivator - python = virtualenv.activation.python:PythonActivator + python = virtualenv.activation.python:PestythonActivator xonsh = virtualenv.activation.xonsh:XonshActivator virtualenv.create = venv = virtualenv.create.via_global_ref.venv:Venv @@ -99,7 +99,7 @@ testing = pytest-randomly >= 1 pytest-timeout >= 1 flaky >= 3 - xonsh >= 0.9.16; python_version > '3.4' + xonsh >= 0.9.16; python_version > '3.4' and python_version != '3.9' [options.package_data] virtualenv.activation.bash = *.sh diff --git a/tests/unit/activation/test_xonsh.py b/tests/unit/activation/test_xonsh.py index f2ed60846..3945d7c8b 100644 --- a/tests/unit/activation/test_xonsh.py +++ b/tests/unit/activation/test_xonsh.py @@ -9,9 +9,9 @@ @pytest.mark.slow -@pytest.mark.skipif(sys.platform == "win32" and IS_PYPY and PY3, reason="xonsh on Windows blocks indefinitely") -@pytest.mark.xfail( - condition=sys.version_info[0:2] == (3, 9), strict=True, reason="https://bugs.python.org/issue40726", +@pytest.mark.skipif( + (sys.platform == "win32" and IS_PYPY and PY3) or sys.version_info[0:2] == (3, 9), + reason="xonsh on Windows blocks indefinitely and is not stable yet on 3.9", ) def test_xonsh(activation_tester_class, activation_tester): class Xonsh(activation_tester_class):