diff options
| author |   Virgil Dupras <vdupras@gentoo.org> | 2019-05-28 07:58:13 -0400 |
|---|---|---|
| committer | Virgil Dupras <vdupras@gentoo.org> | 2019-05-28 07:58:13 -0400 |
| commit | 178b65c465027c1600803eeab46258f99d9e84ed (patch) | |
| tree | a8373000b7602efb2400d4f1b0bc6ccdb31abf3f /dev-python/tox | |
| parent | dev-vcs/darcs: add ~amd64-linux keyword (diff) | |
| download | gentoo-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')
| -rw-r--r-- | dev-python/tox/Manifest | 2 | ||||
| -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 | ||||
| -rw-r--r-- | dev-python/tox/tox-3.12.1.ebuild (renamed from dev-python/tox/tox-3.11.1.ebuild) | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest index faa0bd239c0d..2934f5447aa4 100644 --- a/dev-python/tox/Manifest +++ b/dev-python/tox/Manifest @@ -1,3 +1,3 @@ DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066 -DIST tox-3.11.1.tar.gz 280761 BLAKE2B ef6cacf45c4befecf8d1fcc92c7cb682318018cad3c77c3f2d1cf7110927d2ee0027908ad634a6d30bc56787b2a05032c8709aadda4512bcb392f299ba3b075e SHA512 3c2a4dae6aaea0a9a6a6b4a8bd862b0fb2ff6f08e2ddcecc808e43c444d17e1abd3324428648ced50663b439735a7727f4e780874593e50dc5eb0a714c704d12 +DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f 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") diff --git a/dev-python/tox/tox-3.11.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild index 586d4e574d5c..95e8d9f9534b 100644 --- a/dev-python/tox/tox-3.11.1.ebuild +++ b/dev-python/tox/tox-3.12.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} ) +PYTHON_COMPAT=( python3_{5,6,7} pypy3 ) inherit distutils-r1 @@ -39,7 +39,7 @@ DEPEND="${RDEPEND} # for some reason, --deselect doesn't work in tox's tests PATCHES=( - "${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch" + "${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch" "${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch" ) |