gentoo auto-resync : 19:04:2024 - 12:05:02

4 files changed, 111 insertions, 5 deletions

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index b55238f95264..6cb82b979239 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,7 +1,11 @@
 AUX cartopy-0.21.1-fix-test.patch 1108 BLAKE2B c88a6a68bf0c0737d31049ac2c5a24791779ccc2b29f767056796c138928b04ffea47d8989dec02ed19725527d512920f07c991eb80f1534b83bf842df48b30e SHA512 010f1c844d21c60dca18dbc5530fcbebb5da99bd4a126e6c844bcb32c55533114c53694fbfc381e9a3aecabab8d11d9fb33a826597b9b66eae30c07f304f44e6
 AUX cartopy-0.21.1-fix-test_proj92.patch 5677 BLAKE2B 6ec667d840e4c7909a5c17ed858cd9dd2ea7c8022ece40cdbad00be2b36167e485864c2698969fc033c7c43882fab4b14bd8e3febeaec7c9727c3f34ad84c22f SHA512 e13235d0ee16dbb0748495fc0d697df450f9f4ea7f66845331c5dc3208f70502ebf9c7288730cdd060b20b489b0b2e729bbcb99616a2b6ddf12e42fc45427b06
 AUX cartopy-0.21.1-fix-test_proj92_1.patch 2002 BLAKE2B 891615c88200d3a4ed84ecdbdc1150c82524734dc06c8240534788c0395d5e5244d9a6faeafedf174e1172fb929c36a27b9e2a2aa205293063471dc925e1218b SHA512 156704f18ca398c8327ed3a111cfd87696a0d5f7907d4e8c34ce3e0c8a99eea4930c241f88f6a9c8fe8bfab34148cbbe995a6f471332c97ad88aa0d4d9c567e0
+AUX cartopy-0.23.0-backport-test-fixes.patch 520 BLAKE2B 57edd4f30665f243a7e710f3341fae647c897aab5066adf2749fd3c084adc67a730203d29dc3c5d19b8b963ecde2c41cbfd8a5da2c82e8775161d2ee4621a1ef SHA512 701b61807388962d2be57da2b7d32a0cd0b84584119cd0772d8b2a1da15e9cf233a048c2bd3ac08bd353732f7c2ae36bf500983569c1c42fec093752a9c570bd
 DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1
+DIST cartopy-0.22.0.gh.tar.gz 10907762 BLAKE2B 0524efb2359f72da4e73cc74c41b03f4e335163dea4b86f5b8907b2a20521ce81a42fceebbdd7e582315b33aed0dfdf159469dfa13516c9c46a8f887f847fa21 SHA512 195cc69170c826240e03918de39925459c94c36b76f1a87b8ec3bca7c00ed577eb8c727ccda1511c0f691ac5aea043d3d02d7bfb603624548e63c9a7dc644ad5
+DIST cartopy-0.23.0.gh.tar.gz 10645484 BLAKE2B aa9306e9f5bd85ae28be4802aac1a36d67df5812e9d188ad20d27103eaff1856b7d48e256459519b4e647bdf17fc207e8473ec6ead7413db113311fe821faba6 SHA512 8f357faad592db03c564d2c87f6d1600d2a04a68b71b250925c222cea418b8588f2eb48f64d3ec7210650a34372777ef8416c8f129af7911661615759d2c60b5
 EBUILD cartopy-0.21.1-r1.ebuild 2301 BLAKE2B 0cad49a11e61991c6f2eb42575769941d7944f5b1a802d894d45525ffa045b43f9491123a02f20ee7cf8faf4fa5a792c21096ce1552628542839d8a1765abe15 SHA512 ed4e5e0f66f270fb298276f222f1fc3b68a99288f7714610df7cc772586e1214fc26497e14f542496d56cf21d07922a97bfb89f256a465b76bf85d5af7836e29
-EBUILD cartopy-0.21.1.ebuild 2103 BLAKE2B 40b5cbc22d3ecae968c8e7739264ff3b80c2953d2644e2df0c5d0e82a283a74e583129dea6c4c5b381738527607dc6cc378421c9ac233831b9e55b29e4244016 SHA512 276ac9f06c63821133e8a0d6e752d7a96a09bd1ebc60acbf74825b56ef7f2e2fdad5e874611612c3889aa285348f561776bdaa9d0ac9a00b50183fd2661b3de7
+EBUILD cartopy-0.22.0.ebuild 2153 BLAKE2B 47c7563e70117d433b2d1450efa2fd21666f85d88de9ffcda0378435cb5f087549d3e688ac43706ec6c9f28cd3394de96545c8d4846b84162a2dcc063873226d SHA512 3e3cb0519d3fc86ba19ba2205d9f836b8641da8e02a7635cc8c6706fdad778dce0fc670fb652074461c16d9d069db0101c813fa14194aed8fcce7a50289c18d3
+EBUILD cartopy-0.23.0.ebuild 2193 BLAKE2B 82d5147690bbe2081793db394666cbd1ad41c68a8f18a55f7f6e555d7551273f617db996b4298a062f7436635b0b00f085b9cf3773267705082af22562e63fe7 SHA512 4afffbef0971f207444de7013d948993fac1bac211310fd5f10fa2c2f92e338638bb19023a99b49819b88329563510bfc28e11ba67c477e19855dc7dfa1f15ca
 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591
diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild b/sci-libs/cartopy/cartopy-0.22.0.ebuild
index bad3ea5841c3..cfc80da1d172 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.22.0.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 multibuild multiprocessing virtualx
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 multiprocessing virtualx
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
@@ -55,8 +57,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-fix-test.patch )
-
 EPYTEST_IGNORE=(
 	# Require network access, not covered by markers
 	lib/cartopy/tests/mpl/test_crs.py
@@ -72,6 +72,8 @@ python_prepare_all() {
 	export MPLCONFIGDIR="${T}"
 	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
 
+	sed -i -e "s/exclude =/#exclude =/" pyproject.toml || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/sci-libs/cartopy/cartopy-0.23.0.ebuild b/sci-libs/cartopy/cartopy-0.23.0.ebuild
new file mode 100644
index 000000000000..024cbd93e090
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.23.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{9..12} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 multiprocessing virtualx
+
+MY_PV=${PV/_beta/b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Python package for geospatial data processing and analysis"
+HOMEPAGE="https://scitools.org.uk/cartopy"
+SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		dev-python/shapely[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+		dev-python/pyproj[${PYTHON_USEDEP}]
+		sci-libs/pyshp[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/setuptools-scm[${PYTHON_USEDEP}]
+		dev-python/cython[${PYTHON_USEDEP}]
+	')
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/filelock[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/flufl-lock[${PYTHON_USEDEP}]
+			dev-python/pytest-mpl[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-backport-test-fixes.patch
+)
+
+EPYTEST_IGNORE=(
+	# Require network access, not covered by markers
+	lib/cartopy/tests/mpl/test_crs.py
+	lib/cartopy/tests/mpl/test_gridliner.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	# Prepare matplotlib backend for test suite
+	export MPLCONFIGDIR="${T}"
+	echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	sed -i -e "s/exclude =/#exclude =/" pyproject.toml || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+
+	# Drop all tests needing network access
+	virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed"
+}
diff --git a/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch b/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch
new file mode 100644
index 000000000000..b88d4110dd6f
--- /dev/null
+++ b/sci-libs/cartopy/files/cartopy-0.23.0-backport-test-fixes.patch
@@ -0,0 +1,13 @@
+# backport last test fix just after v0.23 release
+diff --git a/lib/cartopy/tests/mpl/test_gridliner.py b/lib/cartopy/tests/mpl/test_gridliner.py
+index 7d82178..d07573e 100644
+--- a/lib/cartopy/tests/mpl/test_gridliner.py
++++ b/lib/cartopy/tests/mpl/test_gridliner.py
+@@ -496,6 +496,7 @@ def test_gridliner_count_draws():
+         mocked.assert_called_once()
+ 
+ 
++@pytest.mark.natural_earth
+ @pytest.mark.mpl_image_compare(
+     baseline_dir='baseline_images/mpl/test_mpl_integration',
+     filename='simple_global.png')