[gentoo-commits] repo/gentoo:master commit in: dev-python/flit/, dev-python/flit/files/

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     c40f558a9c6450e2c4ea5acb90f0a51510937223
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 19:42:12 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon May 24 19:42:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40f558a

dev-python/flit: Version bump, fix dep in 2.1.0

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-python/flit/Manifest                                 |  1 +
 dev-python/flit/files/flit-3.2.0-tests.patch             | 12 ++++++++++++
 dev-python/flit/flit-2.1.0.ebuild                        |  4 ++--
 dev-python/flit/{flit-2.1.0.ebuild => flit-3.2.0.ebuild} | 14 ++++----------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index 98fa24ff4f5..b98e888eed1 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -1 +1,2 @@
 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
+DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445

diff --git a/dev-python/flit/files/flit-3.2.0-tests.patch b/dev-python/flit/files/flit-3.2.0-tests.patch
new file mode 100644
index 00000000000..7a0a4c5c7a7
--- /dev/null
+++ b/dev-python/flit/files/flit-3.2.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/test_config.py b/tests/test_config.py
+index 214cd17..815005b 100644
+--- a/tests/test_config.py
++++ b/tests/test_config.py
+@@ -5,6 +5,7 @@ from flit.config import read_flit_config, ConfigError
+ 
+ samples_dir = Path(__file__).parent / 'samples'
+ 
++@pytest.mark.skip("Needs internet access")
+ def test_invalid_classifier():
+     with pytest.raises(ConfigError):
+         read_flit_config(samples_dir / 'invalid_classifier.toml')

diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-2.1.0.ebuild
index 2b61057002d..4dd0cc17172 100644
--- a/dev-python/flit/flit-2.1.0.ebuild
+++ b/dev-python/flit/flit-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-python/flit_core[${PYTHON_USEDEP}]
+	<dev-python/flit_core-3.0.0[${PYTHON_USEDEP}]
 	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]

diff --git a/dev-python/flit/flit-2.1.0.ebuild b/dev-python/flit/flit-3.2.0.ebuild
similarity index 74%
copy from dev-python/flit/flit-2.1.0.ebuild
copy to dev-python/flit/flit-3.2.0.ebuild
index 2b61057002d..289ae980771 100644
--- a/dev-python/flit/flit-2.1.0.ebuild
+++ b/dev-python/flit/flit-3.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Simplified packaging of Python modules"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-python/flit_core[${PYTHON_USEDEP}]
+	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
 	dev-python/intreehooks[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/requests_download[${PYTHON_USEDEP}]
@@ -26,14 +26,13 @@ BDEPEND="${RDEPEND}
 	sys-apps/grep
 	sys-apps/findutils
 	test? (
-		>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
 "
 
 PATCHES=(
-	"${FILESDIR}/flit-2.1.0-tests.patch"
+	"${FILESDIR}/flit-3.2.0-tests.patch"
 )
 
 distutils_enable_tests pytest
@@ -45,10 +44,5 @@ python_prepare_all() {
 	printf -- "from setuptools import setup, find_packages\nsetup(name='%s',version='%s',%s)" \
 		"${PN}" "${PV}" "packages=find_packages(exclude=['tests'])" > setup.py || die
 
-	# use toml instead of depricated pytoml
-	grep -r -l -Z -F 'pytoml' | xargs -0 \
-		sed -e 's:import pytoml as toml:import toml:' \
-			-e 's:pytoml:toml:' -i || die
-
 	distutils-r1_python_prepare_all
 }