gentoo resync : 25.09.2021

3 files changed, 52 insertions, 4 deletions

diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
index f789fb2e4894..7bbd973c58bf 100644
--- a/dev-python/owslib/Manifest
+++ b/dev-python/owslib/Manifest
@@ -1,4 +1,6 @@
 AUX owslib-0.20.0-no-privacybreach.patch 1213 BLAKE2B 482a7cbbf12f335aa9367a1d7e311f625069c197b48fda85f063e0f227c2c2300b481b8b71f6572f71a8eb1ac55ff9738c14857d7d99c35423e358394045c628 SHA512 da4955ad7c1175929f3d303dbd7e3f713e26742b270c060b182b158ad4bfafd6e14aaae09f209a12682430655103e6c943ff24a1cb13b6e2bc5aa14a3cc7dfac
 DIST owslib-0.20.0.tar.gz 912319 BLAKE2B 9f6e44f76554d67756839bfad1cdce6e2e7a4db6c3517ed308256745a3ea1df77488718f307bcd59dfcae7bab7801ba1974131f358db1bd070846640ccf08ada SHA512 c30e14d0a310617d2dbcca436f38d4a942b8c5efb96506554e650b20b34580fd0119ae6bf17892bb09ceff7141b9cbfd32deb582d14d81b6518dbbc223116d07
-EBUILD owslib-0.20.0.ebuild 1014 BLAKE2B 3231eadc30c7c7e1be365b1e3b6363053fb6a7487c6936f846dd6f363227c12521d28797bd226260682feb43b735559e03cf348e0fadee54233a0d8872136e96 SHA512 8ed3c9897ceb5d8cbaf43a90cd6c3a732a4a4187facbba6c90b5908d6c9d1fdd78ffd9334587c5f8ea86d0feee0d04054b79ea4b68a99f09e5827c3eb758d2e9
+DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec
+EBUILD owslib-0.20.0.ebuild 1215 BLAKE2B db4ada787d23f0ed22d1464b059214f24321a063e7b9471fbc200fe7af58002097e272b39466462bed241e447b18709ce5ebfe1f206249b000f89d4ddfdd4332 SHA512 f3113321818159c0ec73c9fb6f89fc19d525566e423e102898489758018b3d60ed6e3220923754f9bbec9f3e458c464e0f1f24ef182a805807de19565c0a7991
+EBUILD owslib-0.25.0.ebuild 1009 BLAKE2B 9d5fbe2d6c9efe057e908031012cef689f63dc580412fafa26f0dc28f9a7e162871dca634617bb1fb2ed1d102bbfa93be01fa1d4ed1e3f7778a11ab75104985b SHA512 3deb83a78ec54b679c43d82a18c8c842b8e9d6410e0d9477fd792be580db5c869fe87224cfbb59b4b418fa9c2c923ebdb640426acd0e3631e281282697e7e7b0
 MISC metadata.xml 496 BLAKE2B 811407d4cd3ccc73043d31a65b45df685388e853ee89c58fb9202ef2d3589e3240139c242d1c020bd04af8ec161fb7d2f59a095b695c8d913937f8238582e61d SHA512 e5d01c5465033c270d95e97d91d23315b7228e9b8aa82617a7cc86960c1fd001c8f5853e0b9c676c6fb044e32107028db2b21ce0fe08a9ea4e95b7d7fb86e4a9
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild
index 7349839b7ad3..a5f26d6321dc 100644
--- a/dev-python/owslib/owslib-0.20.0.ebuild
+++ b/dev-python/owslib/owslib-0.20.0.ebuild
@@ -1,9 +1,9 @@
-# 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,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
@@ -34,9 +34,16 @@ DEPEND="
 "
 
 RESTRICT="test" # tests require WAN access
+PROPERTIES="test_network"
 
 PATCHES=( "${FILESDIR}/${P}-no-privacybreach.patch" )
 
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
-	"${EPYTHON}" "${S}/setup.py" test || die
+	epytest  --tb=native --ignore=setup.py --doctest-modules --doctest-glob 'tests/**/*.txt'
+	#"${EPYTHON}" "${S}/setup.py" test || die
 }
diff --git a/dev-python/owslib/owslib-0.25.0.ebuild b/dev-python/owslib/owslib-0.25.0.ebuild
new file mode 100644
index 000000000000..0ff537b66057
--- /dev/null
+++ b/dev-python/owslib/owslib-0.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
+HOMEPAGE="https://geopython.github.io/OWSLib/"
+SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OWSLib-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )"
+
+EPYTEST_DESELECT=(
+	tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i tox.ini || die
+	distutils-r1_src_prepare
+}