[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/, sci-libs/cartopy/files/

2024-04-22 Thread Thomas Beierlein 
commit: f680657ef7ad184b31a4c86b004ec56f8dcd005c
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Mon Apr 22 17:49:23 2024 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Mon Apr 22 17:52:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f680657e

sci-libs/cartopy: drop 0.21.1-r1, 0.22.0

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |   2 -
 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, 375 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 5dee4766c1d8..d8033d252e43 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1 @@
-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

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..
--- 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" ||

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/, sci-libs/cartopy/files/

2024-04-18 Thread Thomas Beierlein 
commit: 232ab0fd0c724d7d66bd961cf9f419f51d574733
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Thu Apr 18 18:26:07 2024 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Thu Apr 18 18:26:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232ab0fd

sci-libs/cartopy: add 0.23.0

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.23.0.ebuild | 87 ++
 .../files/cartopy-0.23.0-backport-test-fixes.patch | 13 
 3 files changed, 101 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 454beee85fa2..5dee4766c1d8 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1,3 @@
 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

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 ..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 ..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

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2024-04-18 Thread Thomas Beierlein 
commit: 799053cd56a029141f62c3fd252dd6ad5cdfa098
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Thu Apr 18 11:09:15 2024 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Thu Apr 18 11:10:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799053cd

sci-libs/cartopy: add 0.22.0

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.22.0.ebuild | 85 ++
 2 files changed, 86 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index d3c5f7633dcf..454beee85fa2 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
 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

diff --git a/sci-libs/cartopy/cartopy-0.22.0.ebuild 
b/sci-libs/cartopy/cartopy-0.22.0.ebuild
new file mode 100644
index ..cfc80da1d172
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.22.0.ebuild
@@ -0,0 +1,85 @@
+# 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"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2024-04-18 Thread Thomas Beierlein 
commit: 1c788aaa725430183421df9d4fdea5af3c1f4384
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Thu Apr 18 11:12:04 2024 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Thu Apr 18 11:12:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c788aaa

sci-libs/cartopy: drop 0.21.1

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1.ebuild | 83 --
 1 file changed, 83 deletions(-)

diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1.ebuild
deleted file mode 100644
index bad3ea5841c3..
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 )
-
-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"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/files/, sci-libs/cartopy/

2023-07-20 Thread Thomas Beierlein 
commit: f13ca1e55681ae792c7b6a63f57e4eb6bdb2722a
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Fri Jul 21 05:37:41 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Fri Jul 21 05:41:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13ca1e5

sci-libs/cartopy: Fix failing tests with >=sci-libs/proj-9.2

See https://github.com/SciTools/cartopy/issues/2145

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1-r1.ebuild  |   5 +-
 .../files/cartopy-0.21.1-fix-test_proj92.patch | 126 +
 .../files/cartopy-0.21.1-fix-test_proj92_1.patch   |  46 
 3 files changed, 176 insertions(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
index 80e71d718b8f..e7186c4571c4 100644
--- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
@@ -57,7 +57,10 @@ BDEPEND="
)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-fix-test.patch )
+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

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
new file mode 100644
index ..e9f1d03eeeb2
--- /dev/null
+++ b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test_proj92.patch
@@ -0,0 +1,126 @@
+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)
+ 
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2023-07-20 Thread Thomas Beierlein 
commit: 722d593beaa588ac418ac4cadcab11c1165af8a3
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Thu Jul 20 18:19:29 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Thu Jul 20 18:20:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722d593b

sci-libs/cartopy: Readd '-n' parameter for pytest

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
index 4c1597167aa6..80e71d718b8f 100644
--- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
@@ -81,5 +81,5 @@ python_test() {
cd "${BUILD_DIR}" || die
 
# Drop all tests needing network access
-   virtx epytest -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"
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2023-07-20 Thread Thomas Beierlein 
commit: dcb7bf40cdba6610cb05a2d9ea23ce98ead0cef3
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Tue Jul 18 16:45:18 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Thu Jul 20 18:20:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb7bf40

sci-libs/cartopy: Cleanup inherits and add DISTUTILS_EXT

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
index 29d90378d1ef..4c1597167aa6 100644
--- a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
@@ -4,10 +4,11 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
 PYTHON_COMPAT=( python3_{9..11} )
 
 DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1 multibuild virtualx
+inherit distutils-r1 multibuild multiprocessing virtualx
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2023-07-18 Thread Thomas Beierlein 
commit: e36b7c375189646f888ab42f9620103440b86478
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Tue Jul 18 13:21:08 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Tue Jul 18 13:23:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36b7c37

sci-libs/cartopy: Use PEP517 build

Furthermore drop unsupported '-n' switch in epytest

Closes: https://bugs.gentoo.org/910025
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1-r1.ebuild | 84 +++
 1 file changed, 84 insertions(+)

diff --git a/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
new file mode 100644
index ..29d90378d1ef
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.21.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 multibuild 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 )
+
+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 -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/files/, sci-libs/cartopy/

2023-02-18 Thread Thomas Beierlein 
commit: d5a9bcdbfaff5a2a5378226a1c68a834febe94f5
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sat Feb 18 16:16:38 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sat Feb 18 16:18:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a9bcdb

sci-libs/cartopy: Fix test error for >=dev-python/matplotlib-3.7

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1.ebuild |  2 ++
 .../cartopy/files/cartopy-0.21.1-fix-test.patch| 28 ++
 2 files changed, 30 insertions(+)

diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1.ebuild
index 380a7c7ba024..e5519d8baee0 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -55,6 +55,8 @@ BDEPEND="
)
 "
 
+PATCHES=( "${FILESDIR}"/${P}-fix-test.patch )
+
 EPYTEST_IGNORE=(
# Require network access, not covered by markers
lib/cartopy/tests/mpl/test_crs.py

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
new file mode 100644
index ..fd308b326c68
--- /dev/null
+++ b/sci-libs/cartopy/files/cartopy-0.21.1-fix-test.patch
@@ -0,0 +1,28 @@
+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')

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2023-02-18 Thread Thomas Beierlein 
commit: e0592bbd3a5966ce3038fdb28669db9df37f4d31
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sat Feb 18 16:19:04 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sat Feb 18 16:19:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0592bbd

sci-libs/cartopy: enable py3.11

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1.ebuild
index e5519d8baee0..40c419a3323b 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 multibuild multiprocessing virtualx

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2023-01-29 Thread Thomas Beierlein 
commit: 162e6ffbf79f187cefe7a5010de73e430a8dcffc
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Jan 29 15:26:34 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Jan 29 15:26:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162e6ffb

sci-libs/cartopy: drop 0.21.0-r1

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest |  1 -
 sci-libs/cartopy/cartopy-0.21.0-r1.ebuild | 81 ---
 2 files changed, 82 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index cf0c8bc01cbb..d3c5f7633dcf 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1 @@
-DIST cartopy-0.21.0.gh.tar.gz 10815721 BLAKE2B 
8a249d6e6b19d5a784a25d44fe062b5417811078f9b5362beed4e60f6a7e3d89996773a0b9530c96a27d3aa3a5a62ce05010ee17cc9ea71d33b9d7f6d1a5c602
 SHA512 
bb227e3f9ff591a33e7b4c053010321b04f2a03c68e84b1ea17cab125fc1d04f587b7f54125fe5bd3faae1379a0df8a217fd0ad5f85a7c461f9595f5b38f72f9
 DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 
4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788
 SHA512 
de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1

diff --git a/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
deleted file mode 100644
index e0c53cc8374c..
--- a/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..10} )
-
-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_git_archive[${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
-
-   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"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2023-01-29 Thread Thomas Beierlein 
commit: 72b3489cae77410e98c63b01601f340f034b187d
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Jan 29 14:14:32 2023 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Jan 29 14:15:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72b3489c

sci-libs/cartopy: Fix dependency

Closes: https://bugs.gentoo.org/891231
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.21.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1.ebuild
index e0c53cc8374c..380a7c7ba024 100644
--- a/sci-libs/cartopy/cartopy-0.21.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit distutils-r1 multiprocessing virtualx
+inherit distutils-r1 multibuild multiprocessing virtualx
 
 MY_PV=${PV/_beta/b}
 MY_P=${PN}-${MY_PV}
@@ -41,7 +41,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
$(python_gen_cond_dep '
-   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
')
test? (

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-12-28 Thread Thomas Beierlein 
commit: 3d18768e7ce44b84eec6d28adf5df3c9c9a0b411
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Wed Dec 28 10:45:45 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Wed Dec 28 10:47:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d18768e

sci-libs/cartopy: drop 0.20.3-r3

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest |  1 -
 sci-libs/cartopy/cartopy-0.20.3-r3.ebuild | 78 ---
 2 files changed, 79 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 194e19419632..2a15d555af82 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1 @@
-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

diff --git a/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild 
b/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
deleted file mode 100644
index 926f138d6ada..
--- a/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 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"
-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
-   >=sci-libs/proj-8
-   $(python_gen_cond_dep '
-   dev-python/numpy[${PYTHON_USEDEP}]
-   dev-python/shapely[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-"${MPLCONFIGDIR}"/matplotlibrc || die
-
-   distutils-r1_python_prepare_all
-}
-
-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"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-12-28 Thread Thomas Beierlein 
commit: 315ec115b0312f4e43cacfdcc93fce4ba1505532
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Wed Dec 28 10:46:32 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Wed Dec 28 10:47:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315ec115

sci-libs/cartopy: add 0.21.1

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.21.1.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 2a15d555af82..cf0c8bc01cbb 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
 DIST cartopy-0.21.0.gh.tar.gz 10815721 BLAKE2B 
8a249d6e6b19d5a784a25d44fe062b5417811078f9b5362beed4e60f6a7e3d89996773a0b9530c96a27d3aa3a5a62ce05010ee17cc9ea71d33b9d7f6d1a5c602
 SHA512 
bb227e3f9ff591a33e7b4c053010321b04f2a03c68e84b1ea17cab125fc1d04f587b7f54125fe5bd3faae1379a0df8a217fd0ad5f85a7c461f9595f5b38f72f9
+DIST cartopy-0.21.1.gh.tar.gz 10815884 BLAKE2B 
4137f593b6ce35270f9df5016529250a07c57ec5a95843db8740eb494f55109b5129cf72153b0216e4f786771bf5cedde3caaecd40175fe9ad5c6fb65ad84788
 SHA512 
de1d09ee3bf6af13bcc7cc4bb1f7c13335ba67e05d2ad64efa0fb00bdb74c7e13c6fc44822d5ac1d70ee7d39b2322280c1395dc66119b9ecd94ca26014e413a1

diff --git a/sci-libs/cartopy/cartopy-0.21.1.ebuild 
b/sci-libs/cartopy/cartopy-0.21.1.ebuild
new file mode 100644
index ..37196a73aff3
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.21.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+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_git_archive[${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
+
+   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"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-08 Thread Sam James 
commit: fbc9830cd2661f6214eec57c4c864fae589133c6
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 10:52:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 10:52:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc9830c

sci-libs/cartopy: simplify gdal dep

Signed-off-by: Sam James  gentoo.org>

 sci-libs/cartopy/{cartopy-0.20.3-r2.ebuild => cartopy-0.20.3-r3.ebuild} | 2 +-
 sci-libs/cartopy/{cartopy-0.21.0.ebuild => cartopy-0.21.0-r1.ebuild}| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild 
b/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
similarity index 97%
rename from sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
rename to sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
index 7761eefa2010..926f138d6ada 100644
--- a/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.3-r3.ebuild
@@ -25,6 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
${PYTHON_DEPS}
+   sci-libs/gdal[python,${PYTHON_SINGLE_USEDEP}]
sci-libs/geos
>=sci-libs/proj-8
$(python_gen_cond_dep '
@@ -35,7 +36,6 @@ RDEPEND="
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/pillow[jpeg,${PYTHON_USEDEP}]
dev-python/pyproj[${PYTHON_USEDEP}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
sci-libs/pyshp[${PYTHON_USEDEP}]
')
 "

diff --git a/sci-libs/cartopy/cartopy-0.21.0.ebuild 
b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
similarity index 97%
rename from sci-libs/cartopy/cartopy-0.21.0.ebuild
rename to sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
index e8fbb387686c..37196a73aff3 100644
--- a/sci-libs/cartopy/cartopy-0.21.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.21.0-r1.ebuild
@@ -25,6 +25,7 @@ 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}]
@@ -34,7 +35,6 @@ RDEPEND="
dev-python/scipy[${PYTHON_USEDEP}]
dev-python/pillow[jpeg,${PYTHON_USEDEP}]
dev-python/pyproj[${PYTHON_USEDEP}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
sci-libs/pyshp[${PYTHON_USEDEP}]
')
 "

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-07 Thread Sam James 
commit: 6dbc1e13af3d1576cd48488b69d27544072812ff
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  7 19:20:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  7 19:57:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbc1e13

sci-libs/cartopy: needs https://github.com/SciTools/cartopy/issues/2086
Signed-off-by: Sam James  gentoo.org>

 sci-libs/cartopy/{cartopy-0.20.3-r1.ebuild => cartopy-0.20.3-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.20.3-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
similarity index 97%
rename from sci-libs/cartopy/cartopy-0.20.3-r1.ebuild
rename to sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
index 4555f424ccdf..7761eefa2010 100644
--- a/sci-libs/cartopy/cartopy-0.20.3-r1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.3-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/shapely[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-07 Thread Sam James 
commit: a51d41ac7a450d84cec26944ab5f5f771ced7cbf
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  7 19:22:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  7 19:57:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51d41ac

sci-libs/cartopy: add pypi upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sci-libs/cartopy/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/cartopy/metadata.xml b/sci-libs/cartopy/metadata.xml
index 5b5ea2c6e4c8..3eeb27253d18 100644
--- a/sci-libs/cartopy/metadata.xml
+++ b/sci-libs/cartopy/metadata.xml
@@ -14,5 +14,6 @@


SciTools/cartopy
+   Cartopy

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-07 Thread Sam James 
commit: ae37b35c7b18f956411954e175b933597cf4ff5f
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  7 19:37:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  7 19:57:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae37b35c

sci-libs/cartopy: add 0.21.0

- Tighten numpy dep (new bound w/ 0.21.0)
- New test dep on dev-python/pytest-mpl
- Drop proj dep, upstream moved to just pure pyproj
- Use epytest
- Use pytest-xdist (tests are fast on my machine but might be useful
  on other arches)

Signed-off-by: Sam James  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.21.0.ebuild | 81 ++
 2 files changed, 82 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index ed9e1515b70e..194e19419632 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
 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

diff --git a/sci-libs/cartopy/cartopy-0.21.0.ebuild 
b/sci-libs/cartopy/cartopy-0.21.0.ebuild
new file mode 100644
index ..e8fbb387686c
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.21.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/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/gdal[python,${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   ')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/setuptools_scm_git_archive[${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
+
+   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"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-07 Thread Sam James 
commit: e522b5c777659de61a43cc2637bdf62f934f67a5
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  7 19:21:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  7 19:57:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e522b5c7

sci-libs/cartopy: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sci-libs/cartopy/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/cartopy/metadata.xml b/sci-libs/cartopy/metadata.xml
index 54adce33ba14..5b5ea2c6e4c8 100644
--- a/sci-libs/cartopy/metadata.xml
+++ b/sci-libs/cartopy/metadata.xml
@@ -12,4 +12,7 @@
and its ability to transform points, lines, vectors, polygons 
and i
images between those projections.

+   
+   SciTools/cartopy
+

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-07 Thread Andreas Sturmlechner 
commit: 5cdd0e8af92de5c57a82c028d10f5608acc029e5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  7 18:17:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct  7 19:18:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cdd0e8a

sci-libs/cartopy: Drop 0.20.1-r1, 0.20.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-libs/cartopy/Manifest |  2 -
 sci-libs/cartopy/cartopy-0.20.1-r1.ebuild | 70 ---
 sci-libs/cartopy/cartopy-0.20.2.ebuild| 70 ---
 3 files changed, 142 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 9aa60979e409..ed9e1515b70e 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1 @@
-DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 
29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c
 SHA512 
fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2
-DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 
18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4
 SHA512 
1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761
 DIST cartopy-0.20.3.tar.gz 10703747 BLAKE2B 
794b0e837893c99bec54423731993a0321f3bd93a01bcc9c1ccfd056d4739d7f4b687c0c05e5e529edd8b350478dc76ccf9f3163061466ee6711949f360f7e7b
 SHA512 
0ac4722ed541d77ac871438b2f4e5252c8ae0ab0551bd62a8ba654e10183bba2f702d70cc7331f1cce488c0a59fe4d24e7009de25d74a563f3b2763a12c504dd

diff --git a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
deleted file mode 100644
index b160723004be..
--- a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   sci-libs/geos
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/pyshp[${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}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
-   dev-python/pyproj[${PYTHON_USEDEP}]
-   >=sci-libs/proj-8
-"
-
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-   dev-python/cython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-   dev-python/filelock[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/flufl-lock[$PYTHON_USEDEP]
-   )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-   # 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
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   cd "${BUILD_DIR}"
-   # drop all tests needing network access
-   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
-}

diff --git a/sci-libs/cartopy/cartopy-0.20.2.ebuild 
b/sci-libs/cartopy/cartopy-0.20.2.ebuild
deleted file mode 100644
index b160723004be..
--- a/sci-libs/cartopy/cartopy-0.20.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-10-07 Thread Sam James 
commit: 69c1639bc9955366554f4de898f2e5d3b1faf383
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  7 18:59:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  7 19:00:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c1639b

sci-libs/cartopy: switch to single-impl Python

This is needed because gdal is single impl now (b/c of various bugs
we hit).

Signed-off-by: Sam James  gentoo.org>

 ...topy-0.20.3.ebuild => cartopy-0.20.3-r1.ebuild} | 63 --
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/sci-libs/cartopy/cartopy-0.20.3.ebuild 
b/sci-libs/cartopy/cartopy-0.20.3-r1.ebuild
similarity index 53%
rename from sci-libs/cartopy/cartopy-0.20.3.ebuild
rename to sci-libs/cartopy/cartopy-0.20.3-r1.ebuild
index 8748a3e391ab..4555f424ccdf 100644
--- a/sci-libs/cartopy/cartopy-0.20.3.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.3-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 virtualx
 
@@ -13,6 +14,7 @@ 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"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-3"
 SLOT="0"
@@ -24,48 +26,53 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
${PYTHON_DEPS}
sci-libs/geos
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/pyshp[${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}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
-   dev-python/pyproj[${PYTHON_USEDEP}]
>=sci-libs/proj-8
+   $(python_gen_cond_dep '
+   dev-python/numpy[${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/gdal[python,${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   ')
 "
-
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-   dev-python/cython[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND="
+   $(python_gen_cond_dep '
+   dev-python/setuptools_scm_git_archive[${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}]
+   ')
+   )
 "
 
 distutils_enable_tests pytest
 
-DEPEND+="test? (
-   dev-python/filelock[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   dev-python/flufl-lock[$PYTHON_USEDEP]
-   )"
-
-S="${WORKDIR}"/${MY_P}
-
 python_prepare_all() {
export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-   # drop test file requiring network access, which got not covered by 
markers
+
+   # 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
+
+   # 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}"
-   # drop all tests needing network access
+   cd "${BUILD_DIR}" || die
+
+   # Drop all tests needing network access
virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
 }

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-08-15 Thread Thomas Beierlein 
commit: 5c049c6bc4dd4e88c6872a372d83f7358b09f0f0
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Tue Aug 16 05:31:00 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Tue Aug 16 05:31:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c049c6b

sci-libs/cartopy: add 0.20.3

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.20.3.ebuild | 71 ++
 2 files changed, 72 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 4e9c493bc31c..9aa60979e409 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1,3 @@
 DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 
29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c
 SHA512 
fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2
 DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 
18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4
 SHA512 
1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761
+DIST cartopy-0.20.3.tar.gz 10703747 BLAKE2B 
794b0e837893c99bec54423731993a0321f3bd93a01bcc9c1ccfd056d4739d7f4b687c0c05e5e529edd8b350478dc76ccf9f3163061466ee6711949f360f7e7b
 SHA512 
0ac4722ed541d77ac871438b2f4e5252c8ae0ab0551bd62a8ba654e10183bba2f702d70cc7331f1cce488c0a59fe4d24e7009de25d74a563f3b2763a12c504dd

diff --git a/sci-libs/cartopy/cartopy-0.20.3.ebuild 
b/sci-libs/cartopy/cartopy-0.20.3.ebuild
new file mode 100644
index ..8748a3e391ab
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.20.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   sci-libs/geos
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${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}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+   dev-python/pyproj[${PYTHON_USEDEP}]
+   >=sci-libs/proj-8
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+   dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/flufl-lock[$PYTHON_USEDEP]
+   )"
+
+S="${WORKDIR}"/${MY_P}
+
+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
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   cd "${BUILD_DIR}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-04-01 Thread Thomas Beierlein 
commit: d22495ce0800c24eab85baf0cec845a1cd1d1982
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Fri Apr  1 09:09:02 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Fri Apr  1 09:09:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22495ce

sci-libs/cartopy: drop 0.19.0, 0.20.1

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 -
 sci-libs/cartopy/cartopy-0.19.0.ebuild | 69 -
 sci-libs/cartopy/cartopy-0.20.1.ebuild | 70 --
 3 files changed, 140 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index e401f3bb438c..4e9c493bc31c 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,3 +1,2 @@
-DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 
129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f
 SHA512 
5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364
 DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 
29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c
 SHA512 
fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2
 DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 
18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4
 SHA512 
1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761

diff --git a/sci-libs/cartopy/cartopy-0.19.0.ebuild 
b/sci-libs/cartopy/cartopy-0.19.0.ebuild
deleted file mode 100644
index 613c5da6a598..
--- a/sci-libs/cartopy/cartopy-0.19.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/pyshp[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-   dev-python/cython[${PYTHON_USEDEP}]
-   sci-libs/geos
-"${MPLCONFIGDIR}"/matplotlibrc || die
-   distutils-r1_python_prepare_all
-}
-
-python_test() {
-   cd "${BUILD_DIR}"
-   # drop all tests needing network access
-   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
-}

diff --git a/sci-libs/cartopy/cartopy-0.20.1.ebuild 
b/sci-libs/cartopy/cartopy-0.20.1.ebuild
deleted file mode 100644
index 1fa38c496b97..
--- a/sci-libs/cartopy/cartopy-0.20.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/pyshp[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
-   dev-python/cython[${PYTHON_USEDEP}]
-   sci-libs/geos
-   >=sci-libs/proj-8
-   dev-python/pyproj[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-   dev-python/filelock[${PYTHON_USEDEP}]
-

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2022-03-27 Thread Thomas Beierlein 
commit: 2b6f5572eebaf357e41ac99d3f10e68c4f608c55
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Mar 27 12:29:52 2022 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Mar 27 12:30:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6f5572

sci-libs/cartopy: add 0.20.2

Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.20.2.ebuild | 70 ++
 2 files changed, 71 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 3bf117380669..e401f3bb438c 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1,3 @@
 DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 
129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f
 SHA512 
5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364
 DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 
29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c
 SHA512 
fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2
+DIST cartopy-0.20.2.tar.gz 10703222 BLAKE2B 
18763971b33704c526bc98dede60077382de1e6855bd5dcc8901d729b9400eb2a3fdb2e6e2bd9b705ad2d43ab089e4837f12b7dc465429f1cdede21f174f8ef4
 SHA512 
1208c11a4b6d4b01b7ed7459ced7d79b0b60abc7be0f88562aa0d3826ac6bcebfe51cdf68213fd668353f4c269eb2c10fc2bf15e9db0b4c5802f629b76be3761

diff --git a/sci-libs/cartopy/cartopy-0.20.2.ebuild 
b/sci-libs/cartopy/cartopy-0.20.2.ebuild
new file mode 100644
index ..10493288f17e
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.20.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   sci-libs/geos
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/scipy[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+   dev-python/pyproj[${PYTHON_USEDEP}]
+   >=sci-libs/proj-8
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+   dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/flufl-lock[$PYTHON_USEDEP]
+   )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+   # 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
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   cd "${BUILD_DIR}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-12-28 Thread Thomas Beierlein 
commit: 8b7bc0969af3a6b9b5f0cc23c1bd6b4136c3d637
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Tue Dec 28 12:05:31 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Tue Dec 28 12:05:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7bc096

sci-libs/cartopy: Move some DEPENDS to RDEPENDS

See also: https://bugs.gentoo.org/830016

Tnx Sam for pointing it out.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.20.1-r1.ebuild | 70 +++
 1 file changed, 70 insertions(+)

diff --git a/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild 
b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
new file mode 100644
index ..d1c4f0d5d167
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.20.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   sci-libs/geos
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/scipy[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+   dev-python/pyproj[${PYTHON_USEDEP}]
+   >=sci-libs/proj-8
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+   dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/flufl-lock[$PYTHON_USEDEP]
+   )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+   # 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
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   cd "${BUILD_DIR}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-12-27 Thread Thomas Beierlein 
commit: a24f0cb6b20b81579a484d0ab7330e3e8ff03ea3
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Mon Dec 27 16:32:32 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Mon Dec 27 16:32:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24f0cb6

sci-libs/cartopy: Fix missing $PYTHON_USEDEP

Closes: https://bugs.gentoo.org/830016
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.20.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.20.1.ebuild 
b/sci-libs/cartopy/cartopy-0.20.1.ebuild
index 6ef30eb28e4f..1fa38c496b97 100644
--- a/sci-libs/cartopy/cartopy-0.20.1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.20.1.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
sci-libs/geos
>=sci-libs/proj-8
-   dev-python/pyproj
+   dev-python/pyproj[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests pytest

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-12-26 Thread Thomas Beierlein 
commit: a42d64d0c700b3b78c8f7bb514d0c6e9127f42cb
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Dec 26 10:22:33 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Dec 26 10:23:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a42d64d0

sci-libs/cartopy: Version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.20.1.ebuild | 70 ++
 2 files changed, 71 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 57508390262e..3bf117380669 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
 DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 
129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f
 SHA512 
5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364
+DIST cartopy-0.20.1.tar.gz 10704635 BLAKE2B 
29ff571a4dccfe71585d6da4d11730fdb7d1b4bf28e9e16a7e928dc154a1fb74169fb122bf9dd2ebbc8b1a3d2ff4cd4591ec2afaa7eb9728ce1ae8a66facff1c
 SHA512 
fe846fcaa8860f5bee4c478aa8a2125dad19d0d7988d10ee587590834728708f2a015104852d4320ba4d2367b78bad36cbdaa2b48cb6ed5b7b4d4e06a86e20d2

diff --git a/sci-libs/cartopy/cartopy-0.20.1.ebuild 
b/sci-libs/cartopy/cartopy-0.20.1.ebuild
new file mode 100644
index ..6ef30eb28e4f
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.20.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/scipy[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+   sci-libs/geos
+   >=sci-libs/proj-8
+   dev-python/pyproj
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+   dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   dev-python/flufl-lock[$PYTHON_USEDEP]
+   )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+   # 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
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   cd "${BUILD_DIR}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-11-22 Thread Thomas Beierlein 
commit: 475e34a1fd166f02421f441c125d63771170e1bc
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Mon Nov 22 19:31:54 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Mon Nov 22 19:32:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=475e34a1

sci-libs/cartopy: Drop old

See also bug# 822819

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 -
 sci-libs/cartopy/cartopy-0.18.0.ebuild | 67 --
 2 files changed, 68 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 0417f6eb7b58..57508390262e 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1 @@
-DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B 
bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc
 SHA512 
912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
 DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 
129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f
 SHA512 
5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
deleted file mode 100644
index ffeef0d90707..
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/pyshp[${PYTHON_USEDEP}]
-   sci-libs/shapely[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   dev-python/scipy[${PYTHON_USEDEP}]
-   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/cython[${PYTHON_USEDEP}]
-   sci-libs/geos
-   sci-libs/proj
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-   dev-python/filelock[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-   # drop test file requiring network access, which got not covered by 
markers
-   rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
-   # 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}"
-   # drop all tests needing network access
-   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-10-10 Thread Thomas Beierlein 
commit: 356a1c1ea4529e3b9ddbfed23ca2469a4326fe11
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Oct 10 17:05:35 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Oct 10 17:06:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=356a1c1e

sci-libs/cartopy: Fix wrong dependency positioning

Closes: https://bugs.gentoo.org/817293
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.19.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.19.0.ebuild 
b/sci-libs/cartopy/cartopy-0.19.0.ebuild
index 236d53b0c15..613c5da6a59 100644
--- a/sci-libs/cartopy/cartopy-0.19.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.19.0.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
dev-python/cython[${PYTHON_USEDEP}]
sci-libs/geos

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-10-09 Thread Thomas Beierlein 
commit: 98e33d90c1acdccdfb59551f4eb1e1ce800143d0
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sat Oct  9 07:32:09 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sat Oct  9 07:33:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e33d90

sci-libs/cartopy: Version bump

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.19.0.ebuild | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index 15559100d5e..0417f6eb7b5 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B 
bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc
 SHA512 
912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
+DIST cartopy-0.19.0.tar.gz 11738107 BLAKE2B 
129a32850947e3439505812655b0feb25f33e3b45a909be56a0093cba41acbf777be7e899b528cc910e044fc8844438283eff4d20a1433ab5ea3c58f240efa0f
 SHA512 
5019c752fed18295048cdbe927e28040b61327414262c67c079572969e8ec3abd76f4cb0e6dd1f8ee4cfb88426cbd926ff9a2e934e8d47b8a3180bf748bd7364

diff --git a/sci-libs/cartopy/cartopy-0.19.0.ebuild 
b/sci-libs/cartopy/cartopy-0.19.0.ebuild
new file mode 100644
index 000..236d53b0c15
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.19.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   sci-libs/shapely[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   dev-python/scipy[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+   sci-libs/geos
+"${MPLCONFIGDIR}"/matplotlibrc || die
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   cd "${BUILD_DIR}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2021-09-19 Thread Thomas Beierlein 
commit: b0111a5b848016ec22b863072dbf6c53c2220c07
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Sep 19 15:19:01 2021 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Sep 19 15:19:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0111a5b

sci-libs/cartopy: Fix setuptools dep

Closes: https://bugs.gentoo.org/813294

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index fbbee50514c..ffeef0d9070 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-12-19 Thread Thomas Beierlein 
commit: a9c5ab250c68161de4354236a31f323f2e583f36
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sat Dec 19 14:52:23 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sat Dec 19 14:57:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c5ab25

sci-libs/cartopy: Drop python3_6 support

As package depends on sci-libs/shapely which no longer provides support
for python3_6 we drop it here too.

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index d4fd00b90fc..7396023ceb3 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-12-19 Thread Thomas Beierlein 
commit: cb53c4c3ef456f29841537b769b1a220621f639d
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sat Dec 19 14:54:31 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sat Dec 19 14:57:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb53c4c3

sci-libs/cartopy: Add python3_9 support

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index 7396023ceb3..fbbee50514c 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-12-18 Thread Matt Turner 
commit: 365dcdeeaf7e0c0942791102048276bccf7a4402
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec 18 23:38:04 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec 18 23:38:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=365dcdee

Revert "sci-libs/cartopy: Add python3_9 support and drop 3_6"

This reverts commit be004dc155e56999bfbc34beadf96d565f17a171.

This commit broke the tree for sci-visualization/pythonprop.

Signed-off-by: Matt Turner  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index fbbee50514c..d4fd00b90fc 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-12-18 Thread Thomas Beierlein 
commit: be004dc155e56999bfbc34beadf96d565f17a171
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Fri Dec 18 21:20:39 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Fri Dec 18 21:21:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be004dc1

sci-libs/cartopy: Add python3_9 support and drop 3_6

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index d4fd00b90fc..fbbee50514c 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-09-07 Thread Thomas Beierlein 
commit: b8105556f4d5d66f45746d8574d96f4fd395b826
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Tue Sep  8 05:49:02 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Tue Sep  8 05:51:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8105556

sci-libs/cartopy: Add python 3.8 support

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index 0e8e4f590af..2fb1a4020f2 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-08-31 Thread Thomas Beierlein 
commit: 7a266034b98bc5a933391b5b63dfc9b744d158f1
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Mon Aug 31 15:39:34 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Mon Aug 31 15:40:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a266034

sci-libs/cartopy: Fix missing USE dependency

Closes: https://bugs.gentoo.org/739660
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
index 0be07b47077..0e8e4f590af 100644
--- a/sci-libs/cartopy/cartopy-0.18.0.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
dev-python/matplotlib[${PYTHON_USEDEP}]
sci-libs/scipy[${PYTHON_USEDEP}]
-   dev-python/pillow[${PYTHON_USEDEP}]
+   dev-python/pillow[jpeg,${PYTHON_USEDEP}]
sci-libs/gdal[python,${PYTHON_USEDEP}]
 "

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-08-29 Thread Thomas Beierlein 
commit: 57333166649c9919657df04486f025867bf95eec
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sat Aug 29 17:37:51 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sat Aug 29 17:38:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57333166

sci-libs/cartopy: Drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest|  1 -
 sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild | 65 
 2 files changed, 66 deletions(-)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index def25f78022..15559100d5e 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1,2 +1 @@
 DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B 
bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc
 SHA512 
912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
-DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 
5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4
 SHA512 
95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe

diff --git a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
deleted file mode 100644
index 0be07b47077..000
--- a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 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"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-python/numpy[${PYTHON_USEDEP}]
-   sci-libs/pyshp[${PYTHON_USEDEP}]
-   sci-libs/Shapely[${PYTHON_USEDEP}]
-   dev-python/six[${PYTHON_USEDEP}]
-   dev-python/matplotlib[${PYTHON_USEDEP}]
-   sci-libs/scipy[${PYTHON_USEDEP}]
-   dev-python/pillow[${PYTHON_USEDEP}]
-   sci-libs/gdal[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-   dev-python/setuptools[${PYTHON_USEDEP}]
-   dev-python/cython[${PYTHON_USEDEP}]
-   sci-libs/geos
-   sci-libs/proj
-"
-
-distutils_enable_tests pytest
-
-DEPEND+="test? (
-   dev-python/filelock[${PYTHON_USEDEP}]
-   dev-python/mock[${PYTHON_USEDEP}]
-   dev-python/pytest[${PYTHON_USEDEP}]
-   )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-   # drop test file requiring network access, which got not covered by 
markers
-   rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
-   # 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}"
-   # drop all tests needing network access
-   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
-}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-07-08 Thread Thomas Beierlein 
commit: a39cdf38b71b038b7ae4de3f26c05f3a45b0f1f9
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Wed Jul  8 17:36:48 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Wed Jul  8 17:37:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39cdf38

sci-libs/cartopy: Version bump

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest  |  1 +
 sci-libs/cartopy/cartopy-0.18.0.ebuild | 65 ++
 2 files changed, 66 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
index b4a3dc8825c..def25f78022 100644
--- a/sci-libs/cartopy/Manifest
+++ b/sci-libs/cartopy/Manifest
@@ -1 +1,2 @@
+DIST cartopy-0.18.0.tar.gz 14191937 BLAKE2B 
bb10791ef2534dad404cc492e378161a4a078813b09d6e2c16d0d465c7dcfbaa7f24d3818cfe0f1f46e7683bdf2e00440640534835ce064492d5321489e355bc
 SHA512 
912d5ab57c96b9e6c51b3ad26f94d77e495eb9c3a8fb8a68bdd957c11b1bc8a3ddc97e76e0d8a5ec9afca9302b01fe5753f4208ec3829df8741ee0ebbaafe30f
 DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 
5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4
 SHA512 
95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe

diff --git a/sci-libs/cartopy/cartopy-0.18.0.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0.ebuild
new file mode 100644
index 000..0be07b47077
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.18.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   sci-libs/Shapely[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/pillow[${PYTHON_USEDEP}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+   sci-libs/geos
+   sci-libs/proj
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+   dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+   # drop test file requiring network access, which got not covered by 
markers
+   rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
+   # 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}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-04-23 Thread Thomas Beierlein 
commit: 1b4fd280c17229c6d4cb804cc20e3363e70c7606
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Thu Apr 23 16:17:33 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Thu Apr 23 16:18:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b4fd280

sci-libs/cartopy: Add support for Python3.7

py3.8 has to wait until deps are supporting it.

Closes: https://bugs.gentoo.org/718492
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
index 01048dc6aca..0be07b47077 100644
--- a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
+++ b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1 virtualx
 
 MY_PV=${PV/_beta/b}

[gentoo-commits] repo/gentoo:master commit in: sci-libs/cartopy/

2020-03-29 Thread Thomas Beierlein 
commit: 91081c55a118249339229acd798d69e655474223
Author: Thomas Beierlein  gentoo  org>
AuthorDate: Sun Mar 29 17:39:33 2020 +
Commit: Thomas Beierlein  gentoo  org>
CommitDate: Sun Mar 29 17:45:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91081c55

sci-libs/cartopy: New package

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Beierlein  gentoo.org>

 sci-libs/cartopy/Manifest|  1 +
 sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild | 65 
 sci-libs/cartopy/metadata.xml| 15 +++
 3 files changed, 81 insertions(+)

diff --git a/sci-libs/cartopy/Manifest b/sci-libs/cartopy/Manifest
new file mode 100644
index 000..b4a3dc8825c
--- /dev/null
+++ b/sci-libs/cartopy/Manifest
@@ -0,0 +1 @@
+DIST cartopy-0.18.0_beta1.tar.gz 14215372 BLAKE2B 
5bb1e98f18fdf57c0459202bfe77d4e4a476a3008e2f21a77cf643711cc3c438626915c31ee48886e980466f952985503987e3ed571295e2beb6c12754b382c4
 SHA512 
95d3bd87e57bea89eb2c25d6a709285ba59fb0f994abc3b37faf29b272b73647d0bc8979a25b1480f48bb55c957f4183ac3c3ad49b830ce686e931227c797abe

diff --git a/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild 
b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
new file mode 100644
index 000..01048dc6aca
--- /dev/null
+++ b/sci-libs/cartopy/cartopy-0.18.0_beta1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+inherit distutils-r1 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"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   sci-libs/pyshp[${PYTHON_USEDEP}]
+   sci-libs/Shapely[${PYTHON_USEDEP}]
+   dev-python/six[${PYTHON_USEDEP}]
+   dev-python/matplotlib[${PYTHON_USEDEP}]
+   sci-libs/scipy[${PYTHON_USEDEP}]
+   dev-python/pillow[${PYTHON_USEDEP}]
+   sci-libs/gdal[python,${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+   dev-python/setuptools[${PYTHON_USEDEP}]
+   dev-python/cython[${PYTHON_USEDEP}]
+   sci-libs/geos
+   sci-libs/proj
+"
+
+distutils_enable_tests pytest
+
+DEPEND+="test? (
+   dev-python/filelock[${PYTHON_USEDEP}]
+   dev-python/mock[${PYTHON_USEDEP}]
+   dev-python/pytest[${PYTHON_USEDEP}]
+   )"
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+   # drop test file requiring network access, which got not covered by 
markers
+   rm "${S}"/lib/cartopy/tests/mpl/test_crs.py || die
+   # 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}"
+   # drop all tests needing network access
+   virtx pytest -vv -m "not network and not natural_earth" || die "test 
failed"
+}

diff --git a/sci-libs/cartopy/metadata.xml b/sci-libs/cartopy/metadata.xml
new file mode 100644
index 000..5bffb905015
--- /dev/null
+++ b/sci-libs/cartopy/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   tom...@gentoo.org
+   Thomas Beierlein
+   
+   
+   Cartopy is a Python package designed for geospatial data 
processing
+   in order to produce maps and other geospatial data analyses.
+   Key features of cartopy are its object oriented projection 
definitions, 
+   and its ability to transform points, lines, vectors, polygons 
and i
+   images between those projections.
+   
+