| 1 |
commit: 178b65c465027c1600803eeab46258f99d9e84ed |
| 2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 28 11:58:13 2019 +0000 |
| 4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 28 11:58:13 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178b65c4 |
| 7 |
|
| 8 |
dev-python/tox: bump to 3.12.1 |
| 9 |
|
| 10 |
Also, drop py2 compat. |
| 11 |
|
| 12 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 14 |
|
| 15 |
dev-python/tox/Manifest | 2 +- |
| 16 |
...-tests.patch => tox-3.12.1-skip-broken-tests.patch} | 18 +++++++++--------- |
| 17 |
.../tox/{tox-3.11.1.ebuild => tox-3.12.1.ebuild} | 4 ++-- |
| 18 |
3 files changed, 12 insertions(+), 12 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest |
| 21 |
index faa0bd239c0..2934f5447aa 100644 |
| 22 |
--- a/dev-python/tox/Manifest |
| 23 |
+++ b/dev-python/tox/Manifest |
| 24 |
@@ -1,3 +1,3 @@ |
| 25 |
DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066 |
| 26 |
-DIST tox-3.11.1.tar.gz 280761 BLAKE2B ef6cacf45c4befecf8d1fcc92c7cb682318018cad3c77c3f2d1cf7110927d2ee0027908ad634a6d30bc56787b2a05032c8709aadda4512bcb392f299ba3b075e SHA512 3c2a4dae6aaea0a9a6a6b4a8bd862b0fb2ff6f08e2ddcecc808e43c444d17e1abd3324428648ced50663b439735a7727f4e780874593e50dc5eb0a714c704d12 |
| 27 |
+DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a |
| 28 |
DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f |
| 29 |
|
| 30 |
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 |
| 31 |
similarity index 83% |
| 32 |
rename from dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch |
| 33 |
rename to dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch |
| 34 |
index 56f692948d3..382bf2b158e 100644 |
| 35 |
--- a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch |
| 36 |
+++ b/dev-python/tox/files/tox-3.12.1-skip-broken-tests.patch |
| 37 |
@@ -12,10 +12,10 @@ index 6a8ac18..56dbe95 100644 |
| 38 |
monkeypatch.setenv(str("TOX_REPORTER_TIMESTAMP"), str("1")) |
| 39 |
initproj( |
| 40 |
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py |
| 41 |
-index c64ec1b..b16a4f2 100644 |
| 42 |
+index b814b7a..fe7ebe3 100644 |
| 43 |
--- a/tests/unit/config/test_config.py |
| 44 |
+++ b/tests/unit/config/test_config.py |
| 45 |
-@@ -1886,7 +1886,7 @@ class TestConfigTestEnv: |
| 46 |
+@@ -1897,7 +1897,7 @@ class TestConfigTestEnv: |
| 47 |
for name, config in configs.items(): |
| 48 |
assert config.basepython == "python{}.{}".format(name[2], name[3]) |
| 49 |
|
| 50 |
@@ -24,12 +24,12 @@ index c64ec1b..b16a4f2 100644 |
| 51 |
with pytest.warns(UserWarning, match=r"conflicting basepython .*"): |
| 52 |
config = newconfig( |
| 53 |
""" |
| 54 |
-diff --git a/tests/unit/test_interpreters.py b/tests/unit/test_interpreters.py |
| 55 |
-index 1eba27e..af7930b 100644 |
| 56 |
---- a/tests/unit/test_interpreters.py |
| 57 |
-+++ b/tests/unit/test_interpreters.py |
| 58 |
-@@ -40,7 +40,7 @@ def test_locate_via_py(monkeypatch): |
| 59 |
- assert tox.interpreters.locate_via_py(spec) |
| 60 |
+diff --git a/tests/unit/interpreters/test_interpreters.py b/tests/unit/interpreters/test_interpreters.py |
| 61 |
+index ea6f65d..e4f0e92 100644 |
| 62 |
+--- a/tests/unit/interpreters/test_interpreters.py |
| 63 |
++++ b/tests/unit/interpreters/test_interpreters.py |
| 64 |
+@@ -28,7 +28,7 @@ def create_interpreters_instance(): |
| 65 |
+ return Interpreters(hook=pm.hook) |
| 66 |
|
| 67 |
|
| 68 |
-def test_tox_get_python_executable(): |
| 69 |
@@ -37,7 +37,7 @@ index 1eba27e..af7930b 100644 |
| 70 |
class envconfig: |
| 71 |
basepython = sys.executable |
| 72 |
envname = "pyxx" |
| 73 |
-@@ -84,7 +84,7 @@ def test_tox_get_python_executable(): |
| 74 |
+@@ -72,7 +72,7 @@ def test_tox_get_python_executable(): |
| 75 |
|
| 76 |
|
| 77 |
@pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows") |
| 78 |
|
| 79 |
diff --git a/dev-python/tox/tox-3.11.1.ebuild b/dev-python/tox/tox-3.12.1.ebuild |
| 80 |
similarity index 92% |
| 81 |
rename from dev-python/tox/tox-3.11.1.ebuild |
| 82 |
rename to dev-python/tox/tox-3.12.1.ebuild |
| 83 |
index 586d4e574d5..95e8d9f9534 100644 |
| 84 |
--- a/dev-python/tox/tox-3.11.1.ebuild |
| 85 |
+++ b/dev-python/tox/tox-3.12.1.ebuild |
| 86 |
@@ -3,7 +3,7 @@ |
| 87 |
|
| 88 |
EAPI=7 |
| 89 |
|
| 90 |
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} pypy{,3} ) |
| 91 |
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 ) |
| 92 |
|
| 93 |
inherit distutils-r1 |
| 94 |
|
| 95 |
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND} |
| 96 |
|
| 97 |
# for some reason, --deselect doesn't work in tox's tests |
| 98 |
PATCHES=( |
| 99 |
- "${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch" |
| 100 |
+ "${FILESDIR}/${PN}-3.12.1-skip-broken-tests.patch" |
| 101 |
"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch" |
| 102 |
) |
Archives