summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVirgil Dupras <vdupras@gentoo.org>2019-05-28 07:58:13 -0400
committerVirgil Dupras <vdupras@gentoo.org>2019-05-28 07:58:13 -0400
commit178b65c465027c1600803eeab46258f99d9e84ed (patch)
treea8373000b7602efb2400d4f1b0bc6ccdb31abf3f /dev-python/tox/files
parentdev-vcs/darcs: add ~amd64-linux keyword (diff)
downloadgentoo-178b65c465027c1600803eeab46258f99d9e84ed.tar.gz
gentoo-178b65c465027c1600803eeab46258f99d9e84ed.tar.bz2
gentoo-178b65c465027c1600803eeab46258f99d9e84ed.zip
dev-python/tox: bump to 3.12.1
Also, drop py2 compat. Signed-off-by: Virgil Dupras <vdupras@gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11
Diffstat (limited to 'dev-python/tox/files')
-rw-r--r--dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch (renamed from dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch)18
1 files changed, 9 insertions, 9 deletions
diff --git a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
index 56f692948d36..382bf2b158eb 100644
--- a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
+++ b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch
@@ -12,10 +12,10 @@ index 6a8ac18..56dbe95 100644
monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1"))
initproj(
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
-index c64ec1b..b16a4f2 100644
+index b814b7a..fe7ebe3 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
-@@ -1886,7 +1886,7 @@ class TestConfigTestEnv:
+@@ -1897,7 +1897,7 @@ class TestConfigTestEnv:
for name, config in configs.items():
assert config.basepython == "python{}.{}".format(name[2], name[3])
@@ -24,12 +24,12 @@ index c64ec1b..b16a4f2 100644
with pytest.warns(UserWarning, match=r"conflicting basepython .*"):
config = newconfig(
"""
-diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py
-index 1eba27e..af7930b 100644
---- a/tests/unit/test_interpreters.py
-+++ b/tests/unit/test_interpreters.py
-@@ -40,7 +40,7 @@ def test_locate_via_py(monkeypatch):
- assert tox.interpreters.locate_via_py(spec)
+diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py
+index ea6f65d..e4f0e92 100644
+--- a/tests/unit/interpreters/test_interpreters.py
++++ b/tests/unit/interpreters/test_interpreters.py
+@@ -28,7 +28,7 @@ def create_interpreters_instance():
+ return Interpreters(hook=pm.hook)
-def test_tox_get_python_executable():
@@ -37,7 +37,7 @@ index 1eba27e..af7930b 100644
class envconfig:
basepython = sys.executable
envname = "pyxx"
-@@ -84,7 +84,7 @@ def test_tox_get_python_executable():
+@@ -72,7 +72,7 @@ def test_tox_get_python_executable():
@pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")