diff options
Diffstat (limited to 'sci-libs/cartopy')
| -rw-r--r-- | sci-libs/cartopy/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/cartopy/cartopy-0.21.1.ebuild (renamed from sci-libs/cartopy/cartopy-0.20.3-r3.ebuild) | 23 |
2 files changed, 15 insertions, 12 deletions
diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest index 6cadf29cf475..7deac5be738c 100644 --- a/sci-libs/cartopy/Manifest +++ b/sci-libs/cartopy/Manifest @@ -1,5 +1,5 @@ -DIST cartopy-0.20.3.tar.gz 10703747 BLAKE2B 794b0e837893c99bec54423731993a0321f3bd93a01bcc9c1ccfd056d4739d7f4b687c0c05e5e529edd8b350478dc76ccf9f3163061466ee6711949f360f7e7b SHA512 0ac4722ed541d77ac871438b2f4e5252c8ae0ab0551bd62a8ba654e10183bba2f702d70cc7331f1cce488c0a59fe4d24e7009de25d74a563f3b2763a12c504dd DIST cartopy-0.21.0.gh.tar.gz 10815721 BLAKE2B 8a249d6e6b19d5a784a25d44fe062b5417811078f9b5362beed4e60f6a7e3d89996773a0b9530c96a27d3aa3a5a62ce05010ee17cc9ea71d33b9d7f6d1a5c602 SHA512 bb227e3f9ff591a33e7b4c053010321b04f2a03c68e84b1ea17cab125fc1d04f587b7f54125fe5bd3faae1379a0df8a217fd0ad5f85a7c461f9595f5b38f72f9 -EBUILD cartopy-0.20.3-r3.ebuild 1990 BLAKE2B 5eabfa2137053979e15c8978f60d8d5b5b9b9d5e1b63993b67a2d74e723af129927d24a8b73373adf428d44fc34897b82051d44f55d2cbcfbb789fd4ab1f3a79 SHA512 ff6facbc0f06e46e8fc9daad73b04a0b1e25e2e3e31e6235f4ed1e833debad32c0ec72918e8ae3dc627e1f2d116cc50a9805fc8f366ebe9d1eb8aa61437f853b +DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788 SHA512 de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1 EBUILD cartopy-0.21.0-r1.ebuild 2057 BLAKE2B 252f6483f17d77209c2868fbf38b37ef4c8e9ec208e6db07d031e9ce9a8f0220ab060ef4bc95da5925fca0485003c545ea4e9ef4e9fcf1d23feb4274441f0ff0 SHA512 06517bb7adf4a0ff81b5175c7c4ffa87d4d4c1257b5d44f398313aa4845a479a9c9c6b879abbb7a0467ff66a10b5d21e58996e245ea5d2750dfccf2df1e27b17 +EBUILD cartopy-0.21.1.ebuild 2057 BLAKE2B 252f6483f17d77209c2868fbf38b37ef4c8e9ec208e6db07d031e9ce9a8f0220ab060ef4bc95da5925fca0485003c545ea4e9ef4e9fcf1d23feb4274441f0ff0 SHA512 06517bb7adf4a0ff81b5175c7c4ffa87d4d4c1257b5d44f398313aa4845a479a9c9c6b879abbb7a0467ff66a10b5d21e58996e245ea5d2750dfccf2df1e27b17 MISC metadata.xml 729 BLAKE2B 38605f8140ccae8c9edf2b5eb7bf394e9c99fd089fa998c98422967cc12d3b808d3b7901d3746da25558c9211e47deec01a3d5856176cda8a868c0151a03fed8 SHA512 f3fb714f50475c2e0f4150d20423195fffb39243aefd313e9a9d0fa834364a928a712006d6e1e1def77b902f8c349a4045d3081fe38697054e744441e622a591 diff --git a/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild b/sci-libs/cartopy/cartopy-0.21.1.ebuild index 926f138d6ada..37196a73aff3 100644 --- a/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild +++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild @@ -6,14 +6,14 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 virtualx +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}.tar.gz" +SRC_URI="https://github.com/SciTools/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}"/${MY_P} LICENSE="LGPL-3" @@ -27,12 +27,11 @@ RDEPEND=" ${PYTHON_DEPS} sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}] sci-libs/geos - >=sci-libs/proj-8 $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/numpy-1.19[${PYTHON_USEDEP}] dev-python/shapely[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] - <dev-python/matplotlib-3.6[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] dev-python/scipy[${PYTHON_USEDEP}] dev-python/pillow[jpeg,${PYTHON_USEDEP}] dev-python/pyproj[${PYTHON_USEDEP}] @@ -50,19 +49,23 @@ BDEPEND=" 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} - # Drop test file requiring network access, which got not covered by markers - rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die - rm "${S}"/lib/cartopy/tests/mpl/test_gridliner.py || die - # Prepare matplotlib backend for test suite export MPLCONFIGDIR="${T}" echo "backend : Agg" > "${MPLCONFIGDIR}"/matplotlibrc || die @@ -74,5 +77,5 @@ python_test() { cd "${BUILD_DIR}" || die # Drop all tests needing network access - virtx pytest -vv -m "not network and not natural_earth" || die "test failed" + virtx epytest -n "$(makeopts_jobs)" -m "not network and not natural_earth" || die "test failed" } |