From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5372F138334 for ; Mon, 13 May 2019 18:28:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51170E0839; Mon, 13 May 2019 18:28:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 240CEE0839 for ; Mon, 13 May 2019 18:28:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2CE234421D for ; Mon, 13 May 2019 18:28:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C81EC266 for ; Mon, 13 May 2019 18:28:36 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1557772097.aecf9b8e7f8d0a926fb3c65b35c1a192c34d1474.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/tox/files/, dev-python/tox/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/tox/Manifest dev-python/tox/files/tox-3.10.0-skip-broken-tests.patch dev-python/tox/tox-3.10.0.ebuild dev-python/tox/tox-3.9.0.ebuild X-VCS-Directories: dev-python/tox/ dev-python/tox/files/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: aecf9b8e7f8d0a926fb3c65b35c1a192c34d1474 X-VCS-Branch: master Date: Mon, 13 May 2019 18:28:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 43d0295d-a696-4c5e-a12b-b9657d38d3c2 X-Archives-Hash: 54cbe32f9263033f2ee89d7ba965f3df commit: aecf9b8e7f8d0a926fb3c65b35c1a192c34d1474 Author: Virgil Dupras gentoo org> AuthorDate: Mon May 13 18:28:17 2019 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Mon May 13 18:28:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aecf9b8e dev-python/tox: bump to 3.10.0 Signed-off-by: Virgil Dupras gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-python/tox/Manifest | 2 +- .../tox/files/tox-3.10.0-skip-broken-tests.patch | 61 ++++++++++++++++++++++ .../tox/{tox-3.9.0.ebuild => tox-3.10.0.ebuild} | 7 ++- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest index 35303ce439d..a5fd865a4a8 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.10.0.tar.gz 283016 BLAKE2B bc2cd14ee28d0d1dcb654310072e7a8572143627d34aca131c5571e590a559ecc82477e6905ee00eeaad6bd3d2f899a3ad2cfcf19306cf62349f03cd8ecf0956 SHA512 a40813023308ebdfd4cba92b74637d83588df9b672ad7872d109a3bc1702902773d77048e896c39cb02c96ee530737aa80c4c4b0cf00e45a53d3d345235a897a DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f -DIST tox-3.9.0.tar.gz 282134 BLAKE2B ee2702d3a6392eaaeb9371cfc4823c3cc46731aff2c44eb652958d10c2e337bcc2922480770e7049fca28c06668f436a47c4ef112a8177133566a12ce6394a81 SHA512 7cac28d4f8bc4c30f827a9770da43a06b19fdfec1251c079a380e161851d51df0d395d8b6499100c387a6d711352447a8fd2c14e1ebe6d3a9a0b08ca6c3464ee 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 00000000000..56f692948d3 --- /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/tox-3.9.0.ebuild b/dev-python/tox/tox-3.10.0.ebuild similarity index 83% rename from dev-python/tox/tox-3.9.0.ebuild rename to dev-python/tox/tox-3.10.0.ebuild index 20ffecc2cab..58c6d7a1f42 100644 --- a/dev-python/tox/tox-3.9.0.ebuild +++ b/dev-python/tox/tox-3.10.0.ebuild @@ -9,7 +9,7 @@ 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" @@ -29,6 +29,8 @@ RDEPEND=" dev-python/virtualenv[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} test? ( + >=dev-python/flaky-3.4.0[${PYTHON_USEDEP}] + =dev-python/freezegun-0.3.11[${PYTHON_USEDEP}] dev-python/pathlib2[${PYTHON_USEDEP}] >=dev-python/pytest-3.6[${PYTHON_USEDEP}] @@ -37,10 +39,11 @@ DEPEND="${RDEPEND} # for some reason, --deselect doesn't work in tox's tests PATCHES=( - "${FILESDIR}/${PN}-3.7.0-skip-broken-tests.patch" + "${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}" }