From 1f00990debeffd0052c194989d0a02baac23eb96 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Apr 2024 23:59:31 +0100 Subject: gentoo auto-resync : 22:04:2024 - 23:59:31 --- sci-libs/cartopy/Manifest | 7 -- sci-libs/cartopy/cartopy-0.21.1-r1.ebuild | 88 -------------- sci-libs/cartopy/cartopy-0.22.0.ebuild | 85 -------------- .../cartopy/files/cartopy-0.21.1-fix-test.patch | 28 ----- .../files/cartopy-0.21.1-fix-test_proj92.patch | 126 --------------------- .../files/cartopy-0.21.1-fix-test_proj92_1.patch | 46 -------- 6 files changed, 380 deletions(-) delete mode 100644 sci-libs/cartopy/cartopy-0.21.1-r1.ebuild delete mode 100644 sci-libs/cartopy/cartopy-0.22.0.ebuild delete mode 100644 sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch delete mode 100644 sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch delete mode 100644 sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch (limited to 'sci-libs/cartopy') diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index 6cb82b979239..67f176886705 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,11 +1,4 @@ -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.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-r1.ebuild b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild deleted file mode 100644 index e7186c4571c4..000000000000 --- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 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} ) - -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 multibuild 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="LGPL-3" -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}] - sci-libs/geos - $(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}-fix-test.patch - # backports to fix tests with >=PROJ9.2 - "${FILESDIR}"/${PN}-0.21.1-fix-test_proj92.patch - "${FILESDIR}"/${PN}-0.21.1-fix-test_proj92_1.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 - - 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/cartopy-0.22.0.ebuild b/sci-libs/cartopy/cartopy-0.22.0.ebuild deleted file mode 100644 index cfc80da1d172..000000000000 --- a/sci-libs/cartopy/cartopy-0.22.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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} ) - -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="LGPL-3" -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}] - sci-libs/geos - $(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}] - ') - ) -" - -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.21.1-fix-test.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch deleted file mode 100644 index fd308b326c68..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -Matplotlib-3.7 has merged SubplotBase into AxesBase now, which makes the -class string representation here GeoAxes now, even though we are -still an _instance_ of GeoAxesSubplot - -Backported from https://github.com/SciTools/cartopy/commit/6b4572ba1a8a877f28e25dfe9559c14b7a565958?diff=unified -diff --git a/lib/cartopy/tests/mpl/test_axes.py b/lib/cartopy/tests/mpl/test_axes.py -index eaf5904..d4e37a1 100644 ---- a/lib/cartopy/tests/mpl/test_axes.py -+++ b/lib/cartopy/tests/mpl/test_axes.py -@@ -13,7 +13,8 @@ import pytest - - import cartopy.crs as ccrs - import cartopy.feature as cfeature --from cartopy.mpl.geoaxes import InterProjectionTransform, GeoAxes -+from cartopy.mpl.geoaxes import ( -+ InterProjectionTransform, GeoAxes, GeoAxesSubplot) - - - class TestNoSpherical: -@@ -119,7 +120,7 @@ class Test_Axes_add_geometries: - - def test_geoaxes_subplot(): - ax = plt.subplot(1, 1, 1, projection=ccrs.PlateCarree()) -- assert str(ax.__class__) == "" -+ assert isinstance(ax, GeoAxesSubplot) - - - @pytest.mark.mpl_image_compare(filename='geoaxes_subslice.png') diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch deleted file mode 100644 index e9f1d03eeeb2..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/lib/cartopy/tests/crs/test_equidistant_conic.py b/lib/cartopy/tests/crs/test_equidistant_conic.py -index 045c87e5d..9f50b4f04 100644 ---- a/lib/cartopy/tests/crs/test_equidistant_conic.py -+++ b/lib/cartopy/tests/crs/test_equidistant_conic.py -@@ -10,6 +10,7 @@ - - import numpy as np - from numpy.testing import assert_almost_equal, assert_array_almost_equal -+import pyproj - import pytest - - import cartopy.crs as ccrs -@@ -23,11 +24,16 @@ def test_default(self): - 'y_0=0.0', 'lat_1=20.0', 'lat_2=50.0'} - check_proj_params('eqdc', eqdc, other_args) - -+ expected_x = (-22784919.35600352, 22784919.35600352) -+ expected_y = (-10001965.729313632, 17558791.85156368) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-22784919.3559981, 22784919.3559981) -+ expected_y = (-10001965.72931272, 17558791.85157471) - assert_almost_equal(np.array(eqdc.x_limits), -- (-22784919.35600352, 22784919.35600352), -+ expected_x, - decimal=7) - assert_almost_equal(np.array(eqdc.y_limits), -- (-10001965.729313632, 17558791.85156368), -+ expected_y, - decimal=7) - - def test_eccentric_globe(self): -@@ -37,12 +43,16 @@ def test_eccentric_globe(self): - other_args = {'a=1000', 'b=500', 'lon_0=0.0', 'lat_0=0.0', 'x_0=0.0', - 'y_0=0.0', 'lat_1=20.0', 'lat_2=50.0'} - check_proj_params('eqdc', eqdc, other_args) -- -+ expected_x = (-3016.869847713461, 3016.869847713461) -+ expected_y = (-1216.6029342241113, 2511.0574375797723) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-2960.1009481, 2960.1009481) -+ expected_y = (-1211.05573766, 2606.04249537) - assert_almost_equal(np.array(eqdc.x_limits), -- (-3016.869847713461, 3016.869847713461), -+ expected_x, - decimal=7) - assert_almost_equal(np.array(eqdc.y_limits), -- (-1216.6029342241113, 2511.0574375797723), -+ expected_y, - decimal=7) - - def test_eastings(self): -@@ -127,12 +137,16 @@ def test_ellipsoid_transform(self): - 'lat_0=23.0', 'x_0=0.0', 'y_0=0.0', 'lat_1=29.5', - 'lat_2=45.5'} - check_proj_params('eqdc', eqdc, other_args) -- -+ expected_x = (-22421870.719894886, 22421870.719894886) -+ expected_y = (-12546277.778958388, 17260638.403203618) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-22421870.71988974, 22421870.71988976) -+ expected_y = (-12546277.77895742, 17260638.403216) - assert_almost_equal(np.array(eqdc.x_limits), -- (-22421870.719894886, 22421870.719894886), -+ expected_x, - decimal=7) - assert_almost_equal(np.array(eqdc.y_limits), -- (-12546277.778958388, 17260638.403203618), -+ expected_y, - decimal=7) - - result = eqdc.transform_point(-75.0, 35.0, geodetic) -diff --git a/lib/cartopy/tests/crs/test_sinusoidal.py b/lib/cartopy/tests/crs/test_sinusoidal.py -index 2f2a1821a..9347260a1 100644 ---- a/lib/cartopy/tests/crs/test_sinusoidal.py -+++ b/lib/cartopy/tests/crs/test_sinusoidal.py -@@ -6,6 +6,7 @@ - - import numpy as np - from numpy.testing import assert_almost_equal -+import pyproj - import pytest - - import cartopy.crs as ccrs -@@ -32,10 +33,15 @@ def test_eccentric_globe(self): - other_args = {'a=1000', 'b=500', 'lon_0=0.0', 'x_0=0.0', 'y_0=0.0'} - check_proj_params('sinu', crs, other_args) - -+ expected_x = [-3141.59, 3141.59] -+ expected_y = [-1216.60, 1216.60] -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = [-3141.60, 3141.60] -+ expected_y = [-1211.05, 1211.05] - assert_almost_equal(np.array(crs.x_limits), -- [-3141.59, 3141.59], decimal=2) -+ expected_x, decimal=2) - assert_almost_equal(np.array(crs.y_limits), -- [-1216.60, 1216.60], decimal=2) -+ expected_y, decimal=2) - - def test_offset(self): - crs = ccrs.Sinusoidal() -diff --git a/lib/cartopy/tests/test_crs.py b/lib/cartopy/tests/test_crs.py -index c1a5d11da..b6c38ced3 100644 ---- a/lib/cartopy/tests/test_crs.py -+++ b/lib/cartopy/tests/test_crs.py -@@ -90,9 +90,17 @@ def test_osgb(self, approx): - def test_epsg(self): - uk = ccrs.epsg(27700) - assert uk.epsg_code == 27700 -- assert_almost_equal(uk.x_limits, (-104009.357, 688806.007), decimal=3) -- assert_almost_equal(uk.y_limits, (-8908.37, 1256558.45), decimal=2) -- assert_almost_equal(uk.threshold, 7928.15, decimal=2) -+ expected_x = (-104009.357, 688806.007) -+ expected_y = (-8908.37, 1256558.45) -+ expected_threshold = 7928.15 -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-104728.764, 688806.007) -+ expected_y = (-8908.36, 1256616.32) -+ expected_threshold = 7935.34 -+ assert_almost_equal(uk.x_limits, -+ expected_x, decimal=3) -+ assert_almost_equal(uk.y_limits, expected_y, decimal=2) -+ assert_almost_equal(uk.threshold, expected_threshold, decimal=2) - self._check_osgb(uk) - - def test_epsg_compound_crs(self): diff --git a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch deleted file mode 100644 index 7ce52bb23364..000000000000 --- a/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92_1.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/lib/cartopy/tests/crs/test_lambert_conformal.py b/lib/cartopy/tests/crs/test_lambert_conformal.py -index 6032d2e5c..c64022ff9 100644 ---- a/lib/cartopy/tests/crs/test_lambert_conformal.py -+++ b/lib/cartopy/tests/crs/test_lambert_conformal.py -@@ -5,6 +5,7 @@ - # licensing details. - - from numpy.testing import assert_array_almost_equal -+import pyproj - import pytest - - import cartopy.crs as ccrs -@@ -68,18 +69,29 @@ def test_too_many_parallel(self): - - def test_single_spole(self): - s_pole_crs = ccrs.LambertConformal(standard_parallels=[-1.]) -+ expected_x = (-19939660, 19939660) -+ expected_y = (-735590302, -8183795) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-19840440, 19840440) -+ expected_y = (-370239953, -8191953) -+ print(s_pole_crs.x_limits) - assert_array_almost_equal(s_pole_crs.x_limits, -- (-19939660, 19939660), -+ expected_x, - decimal=0) - assert_array_almost_equal(s_pole_crs.y_limits, -- (-735590302, -8183795), -+ expected_y, - decimal=0) - - def test_single_npole(self): - n_pole_crs = ccrs.LambertConformal(standard_parallels=[1.]) -+ expected_x = (-20130569, 20130569) -+ expected_y = (-8170229, 726200683) -+ if pyproj.__proj_version__ >= '9.2.0': -+ expected_x = (-20222156, 20222156) -+ expected_y = (-8164817, 360848719) - assert_array_almost_equal(n_pole_crs.x_limits, -- (-20130569, 20130569), -+ expected_x, - decimal=0) - assert_array_almost_equal(n_pole_crs.y_limits, -- (-8170229, 726200683), -+ expected_y, - decimal=0) -- cgit v1.2.3