gentoo resync : 18.05.2019

4 files changed, 105 insertions, 7 deletions

diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 31bdc422a4ab..e34dabf68363 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,8 +1,10 @@
+AUX tox-3.10.0-skip-broken-tests.patch 2725 BLAKE2B 112b5be6c97c27ab531f88c01d4ba13452cf25bc46515bf6c6751951595124d257f85083d9a99c9cc8956370f0390facd07abbe1e9f21c627c531bff639eeef1 SHA512 67e93d9ba10c464f66170342e8bc20f48e57505b72b845effa7e8defb34eaef90ff4b3495847dc7696d5b50359ab032d207ea88dddcf669b3d315bed31e73b29
 AUX tox-3.7.0-skip-broken-tests.patch 1607 BLAKE2B e25c18c9706914a8e7e209a7a9eaaa3407cd339b9d4fdfbfc13d3daf0598034b0f877491caa13fb21c777983e901ef3aa035b491b59aaca14f09c34af576ca55 SHA512 8a8b684ca56612016ef60df0082a71b0d21619600453f5f93f732d7676afa7785350a0d3d088146a5856820fe877ed186660968c54782b6aa14c79ad0ed879fd
+AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540cc2922a897e016b5aabc9974772c9b897e0fab7b38b00f99478a063ad988ffa8b65fa53f684997334e492c SHA512 ff19b2bb7ac963379f1cccd4973ad9eb4dabfbda976cde7caba50ad010d8fa57c1cba91d63e3e0512e44cc7d350bc9270fbd9b30db1bd55f7d9c239e7623d066
+DIST tox-3.10.0.tar.gz 279571 BLAKE2B 7aa77dfee2fe3141626d13f37f2c711cd0891ae7b484f7fe6ab7731d35455a898964c52cedc954a6d4108137e2d73fe9628bb893aa7a337d8e69da15b8516811 SHA512 a1cadf3f8de494b5c7f2e8ae1be11fd42f29ae805b5761f6a22763c303625c860475c5435aaf437e6f2d0213be1ad826d9b6a0950aed21c054a94d492cc85047
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
-DIST tox-3.7.0.tar.gz 267854 BLAKE2B 9b32e6010f47d00e5ad81b31a8b9e809162ec9438c8a98df3e86c37692a3040bc0158d106f5698cdb6e240be54db80ce8b3c4c8710732f85d9eedfe1a0814852 SHA512 7e12f3407c1ad51ae5839bdd7907c7b05654f3a145270573326fbe3903d22c6e63a930c242ecaf1eae746043da090703e48ead7e27973294711f45077217ed37
 EBUILD tox-2.9.1.ebuild 1307 BLAKE2B f9523dd73e57889bc345f1e6d9e47a70b5c63727bd029fd0cdeeba79ca0e6c523248c845270035d4e26d70f31ea788fe94e2d69529bb99625db2a1f49880553c SHA512 09987e74d9cdf82fee990dc7e1813ed8df54a8ffbc157413c6fa0b61763853640066c108b78556601d16f278bdd303d572f4721dcc8dbcd7f4183187f4fe4692
+EBUILD tox-3.10.0.ebuild 1422 BLAKE2B a5a50dbb389b09a6d65e07e24ddf0c6b35d41dd4e18d24312a07e29b823ff7ba1bcf50c6798e873727c764e87a899de49c05d7d80907e19221b69f0f40b3625f SHA512 9f6dd4aad20846936bc8937502e475fc17dd90a7c2d439a1ed6a43f2dcf6d21aae023346dcaade87e8fdb46c0be85dd54f8d7a41b0e8442bfb4f2fcdbd8e327c
 EBUILD tox-3.2.1.ebuild 1953 BLAKE2B 20ef7befbe5fced2de522b65745e159fdbdc323c887eaad5feeda601bc68180651716913e8c84a5fe778a52ce3dcd0db2b7ee76309cd3e7583c2b90914c0ad74 SHA512 255146b77fedd2a709cb6b0bffeac1469811028d7dd806219107139bc27a171826dee2cb0d65672e8e206cd8c0d37fa5d84dab8d81b53aa6b5627b39a9e0e376
-EBUILD tox-3.7.0.ebuild 1270 BLAKE2B af455ec8766bbb88af6eb36be75cc287d9b7ef977e91076ec1df07c75cbd686df6a6043c5445e8531f0e0dbaa30b5bd953589d17ad53d8fb2d22c5467a5130a3 SHA512 b4089abe7796147979f7c3709af0b07a89df482988d6d3a90a0fd3a1416fc7d265e809a9c09bdfe5cdd114b68da4e075645ec86aaf31dbc67fd7423984249ae1
 MISC metadata.xml 465 BLAKE2B eba47520bf4a2f615fbfad7c26ac19af51d6b9c0ef8dff0212a6723376b34a0d17386f05b3f4dd3ab715b9af867fabc038c300fa8df357c648dedb03efbeed88 SHA512 9bcd58c451d7196c9870a04b76a504090ec217c7c88f47f17e141c5c9519fc41d24dfc83d97eb48b935d90b621a0ada1ed664fafffd7880e91627e56259b3c76
diff --git a/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch b/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
new file mode 100644
index 000000000000..56f692948d36
--- /dev/null
+++ b/dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch
@@ -0,0 +1,61 @@
+diff --git a/tests/integration/test_provision_int.py b/tests/integration/test_provision_int.py
+index 6a8ac18..56dbe95 100644
+--- a/tests/integration/test_provision_int.py
++++ b/tests/integration/test_provision_int.py
+@@ -43,7 +43,7 @@ def test_provision_missing(initproj, cmd):
+ @pytest.mark.skipif(
+     "sys.platform == 'win32'", reason="triggering SIGINT reliably on Windows is hard"
+ )
+-def test_provision_interrupt_child(initproj, monkeypatch, capfd):
++def xtest_provision_interrupt_child(initproj, monkeypatch, capfd):
+     monkeypatch.delenv(str("PYTHONPATH"), raising=False)
+     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
+--- a/tests/unit/config/test_config.py
++++ b/tests/unit/config/test_config.py
+@@ -1886,7 +1886,7 @@ class TestConfigTestEnv:
+         for name, config in configs.items():
+             assert config.basepython == "python{}.{}".format(name[2], name[3])
+ 
+-    def test_default_factors_conflict(self, newconfig, capsys):
++    def xtest_default_factors_conflict(self, newconfig, capsys):
+         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)
+ 
+ 
+-def test_tox_get_python_executable():
++def xtest_tox_get_python_executable():
+     class envconfig:
+         basepython = sys.executable
+         envname = "pyxx"
+@@ -84,7 +84,7 @@ def test_tox_get_python_executable():
+ 
+ 
+ @pytest.mark.skipif("sys.platform == 'win32'", reason="symlink execution unreliable on Windows")
+-def test_find_alias_on_path(monkeypatch, tmp_path):
++def xtest_find_alias_on_path(monkeypatch, tmp_path):
+     reporter.update_default_reporter(Verbosity.DEFAULT, Verbosity.DEBUG)
+     magic = tmp_path / "magic{}".format(os.path.splitext(sys.executable)[1])
+     os.symlink(sys.executable, str(magic))
+diff --git a/tests/unit/test_venv.py b/tests/unit/test_venv.py
+index 0523112..3db5416 100644
+--- a/tests/unit/test_venv.py
++++ b/tests/unit/test_venv.py
+@@ -445,7 +445,7 @@ def test_install_command_not_installed_bash(newmocksession):
+     mocksession.report.expect("warning", "*test command found but not*")
+ 
+ 
+-def test_install_python3(newmocksession):
++def xtest_install_python3(newmocksession):
+     if not py.path.local.sysfind("python3"):
+         pytest.skip("needs python3")
+     mocksession = newmocksession(
diff --git a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
new file mode 100644
index 000000000000..f6f78af192dd
--- /dev/null
+++ b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch
@@ -0,0 +1,30 @@
+diff --git a/setup.py b/setup.py
+index 73f2540..8d6f3c3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,19 +1,13 @@
+ # -*- coding: utf-8 -*-
+-import textwrap
++import os
+ 
+ from setuptools import setup
+ 
+-setup(
+-    use_scm_version={
+-        "write_to": "src/tox/version.py",
+-        "write_to_template": textwrap.dedent(
+-            """
+-             # coding: utf-8
+-             from __future__ import unicode_literals
++VERSION = os.environ['PV']
++with open('src/tox/version.py', 'wt') as fp:
++    fp.write("__version__ = u'{}'".format(VERSION))
+ 
+-             __version__ = {version!r}
+-             """
+-        ).lstrip(),
+-    },
++setup(
++    version=VERSION,
+     package_dir={"": "src"},
+ )
diff --git a/dev-python/tox/tox-3.7.0.ebuild b/dev-python/tox/tox-3.10.0.ebuild
index 4a32bc04c976..586d4e574d5c 100644
--- a/dev-python/tox/tox-3.7.0.ebuild
+++ b/dev-python/tox/tox-3.10.0.ebuild
@@ -9,11 +9,11 @@ inherit distutils-r1
 
 DESCRIPTION="virtualenv-based automation of test activities"
 HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
@@ -28,17 +28,22 @@ RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]
 	dev-python/virtualenv[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-2[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
 		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-		<dev-python/pytest-4.0
 		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
 	)"
 
 # for some reason, --deselect doesn't work in tox's tests
-PATCHES=( "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.10.0-skip-broken-tests.patch"
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
 
 python_test() {
+	distutils_install_for_testing
 	pytest -v --no-network || die "Testsuite failed under ${EPYTHON}"
 }