commit: e80fe10fb8b8c952f991c15ccd7bd596724cc97d Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Tue May 25 01:37:57 2021 +0000 Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> CommitDate: Tue May 25 08:06:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e80fe10f
dev-python/geopy: fix deps, rework tests, drop old Closes: https://bugs.gentoo.org/777810 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> dev-python/geopy/Manifest | 1 - dev-python/geopy/geopy-2.0.0.ebuild | 55 --------------------------------- dev-python/geopy/geopy-2.1.0.ebuild | 61 ++++++++++++++++++++++++------------- 3 files changed, 39 insertions(+), 78 deletions(-) diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest index fb82ea0b1..1a545734b 100644 --- a/dev-python/geopy/Manifest +++ b/dev-python/geopy/Manifest @@ -1,2 +1 @@ -DIST geopy-2.0.0.tar.gz 278465 BLAKE2B 08383a509358bf902db6e47f9144380f2694e89f4d2f21f25131f2c885c1a5a9e1111da93374a723a95d117f8bf13b027446e321f098a261624dd8eeeab18577 SHA512 0b572a05c56596f65932ff422827c477d7a1a4f1e42d0cbd53ef9f11e66c60e8f4ab5a169720522c6ee5624826837b4854887a43ed34814ea3520701e60c0c06 DIST geopy-2.1.0.tar.gz 280382 BLAKE2B 061c4f5fee8ce50690df442f431866630b6538831191b2b357ee387133d098e6aa69136ef4f11b9b627e52a8610a22438463c7e1fc5c2b193543a666ddc955b0 SHA512 6d369412f7c685cda7195589341fbd8f57564fa888fa753de266a356627125f971212afbdd7253e16df90870fbfe3faab63dfb898928d9622c6aa8654ec6fe74 diff --git a/dev-python/geopy/geopy-2.0.0.ebuild b/dev-python/geopy/geopy-2.0.0.ebuild deleted file mode 100644 index 37a11b5e2..000000000 --- a/dev-python/geopy/geopy-2.0.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="A Geocoding Toolbox for Python" -HOMEPAGE=" - https://geopy.readthedocs.io - https://github.com/geopy/geopy - https://pypi.org/project/geopy -" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - <sci-geosciences/GeographicLib-2 - >=sci-geosciences/GeographicLib-1.49 -" -BDEPEND="test? ( - dev-python/pytest-aiohttp[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] -)" - -distutils_enable_tests pytest -distutils_enable_sphinx docs \ - ">=dev-python/sphinx_rtd_theme-0.4.0" \ - dev-python/readme_renderer - -python_prepare_all() { - # [Errno -3] Temporary failure in name resolution - rm test/test_adapters.py || die - rm test/geocoders/algolia.py || die - rm test/geocoders/arcgis.py || die - rm test/geocoders/banfrance.py || die - rm test/geocoders/databc.py || die - rm test/geocoders/geocodefarm.py || die - rm test/geocoders/geonames.py || die - rm test/geocoders/nominatim.py || die - rm test/geocoders/photon.py || die - - # depend on the above and now fail to import - rm test/geocoders/openmapquest.py || die - rm test/geocoders/pickpoint.py || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/geopy/geopy-2.1.0.ebuild b/dev-python/geopy/geopy-2.1.0.ebuild index 4487a6ac5..d2745631b 100644 --- a/dev-python/geopy/geopy-2.1.0.ebuild +++ b/dev-python/geopy/geopy-2.1.0.ebuild @@ -3,7 +3,7 @@ EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 @@ -19,10 +19,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -RDEPEND=" - <sci-geosciences/GeographicLib-2 - >=sci-geosciences/GeographicLib-1.49 -" +RDEPEND="dev-python/geographiclib[${PYTHON_USEDEP}]" BDEPEND=" test? ( dev-python/pytest-aiohttp[${PYTHON_USEDEP}] @@ -38,21 +35,41 @@ distutils_enable_sphinx docs \ ">=dev-python/sphinx_rtd_theme-0.4.0" \ dev-python/readme_renderer -python_prepare_all() { - # [Errno -3] Temporary failure in name resolution - rm test/test_adapters.py || die - rm test/geocoders/algolia.py || die - rm test/geocoders/arcgis.py || die - rm test/geocoders/banfrance.py || die - rm test/geocoders/databc.py || die - rm test/geocoders/geocodefarm.py || die - rm test/geocoders/geonames.py || die - rm test/geocoders/nominatim.py || die - rm test/geocoders/photon.py || die - - # depend on the above and now fail to import - rm test/geocoders/openmapquest.py || die - rm test/geocoders/pickpoint.py || die - - distutils-r1_python_prepare_all +python_test() { + epytest \ + --deselect test/test_adapters.py::test_not_available_adapters_raise \ + --deselect test/test_adapters.py::test_geocoder_constructor_uses_https_proxy \ + --deselect test/test_adapters.py::test_geocoder_https_proxy_auth_is_respected \ + --deselect test/test_adapters.py::test_ssl_context_with_proxy_is_respected \ + --deselect test/test_adapters.py::test_ssl_context_without_proxy_is_respected[URLLibAdapter] \ + --deselect test/test_adapters.py::test_ssl_context_without_proxy_is_respected[RequestsAdapter] \ + --deselect test/geocoders/algolia.py \ + --deselect test/geocoders/arcgis.py \ + --deselect test/geocoders/azure.py \ + --deselect test/geocoders/baidu.py \ + --deselect test/geocoders/banfrance.py \ + --deselect test/geocoders/bing.py::TestBing \ + --deselect test/geocoders/databc.py \ + --deselect test/geocoders/geocodeearth.py \ + --deselect test/geocoders/geocodefarm.py \ + --deselect test/geocoders/geolake.py::TestGeolake \ + --deselect test/geocoders/geonames.py::TestGeoNames \ + --deselect test/geocoders/geonames.py::TestGeoNamesInvalidAccount \ + --deselect test/geocoders/googlev3.py \ + --deselect test/geocoders/here.py::TestHereApiKey \ + --deselect test/geocoders/here.py::TestHereLegacyAuth \ + --deselect test/geocoders/ignfrance.py \ + --deselect test/geocoders/mapbox.py \ + --deselect test/geocoders/mapquest.py \ + --deselect test/geocoders/maptiler.py \ + --deselect test/geocoders/nominatim.py \ + --deselect test/geocoders/opencage.py::TestOpenCage \ + --deselect test/geocoders/openmapquest.py::TestOpenMapQuest \ + --deselect test/geocoders/pelias.py \ + --deselect test/geocoders/photon.py \ + --deselect test/geocoders/pickpoint.py \ + --deselect test/geocoders/smartystreets.py::TestLiveAddress::test_geocode \ + --deselect test/geocoders/tomtom.py \ + --deselect test/geocoders/what3words.py \ + --deselect test/geocoders/yandex.py }
