1 |
commit: e80fe10fb8b8c952f991c15ccd7bd596724cc97d |
2 |
Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Tue May 25 01:37:57 2021 +0000 |
4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
5 |
CommitDate: Tue May 25 08:06:54 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e80fe10f |
7 |
|
8 |
dev-python/geopy: fix deps, rework tests, drop old |
9 |
|
10 |
Closes: https://bugs.gentoo.org/777810 |
11 |
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> |
12 |
|
13 |
dev-python/geopy/Manifest | 1 - |
14 |
dev-python/geopy/geopy-2.0.0.ebuild | 55 --------------------------------- |
15 |
dev-python/geopy/geopy-2.1.0.ebuild | 61 ++++++++++++++++++++++++------------- |
16 |
3 files changed, 39 insertions(+), 78 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest |
19 |
index fb82ea0b1..1a545734b 100644 |
20 |
--- a/dev-python/geopy/Manifest |
21 |
+++ b/dev-python/geopy/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST geopy-2.0.0.tar.gz 278465 BLAKE2B 08383a509358bf902db6e47f9144380f2694e89f4d2f21f25131f2c885c1a5a9e1111da93374a723a95d117f8bf13b027446e321f098a261624dd8eeeab18577 SHA512 0b572a05c56596f65932ff422827c477d7a1a4f1e42d0cbd53ef9f11e66c60e8f4ab5a169720522c6ee5624826837b4854887a43ed34814ea3520701e60c0c06 |
24 |
DIST geopy-2.1.0.tar.gz 280382 BLAKE2B 061c4f5fee8ce50690df442f431866630b6538831191b2b357ee387133d098e6aa69136ef4f11b9b627e52a8610a22438463c7e1fc5c2b193543a666ddc955b0 SHA512 6d369412f7c685cda7195589341fbd8f57564fa888fa753de266a356627125f971212afbdd7253e16df90870fbfe3faab63dfb898928d9622c6aa8654ec6fe74 |
25 |
|
26 |
diff --git a/dev-python/geopy/geopy-2.0.0.ebuild b/dev-python/geopy/geopy-2.0.0.ebuild |
27 |
deleted file mode 100644 |
28 |
index 37a11b5e2..000000000 |
29 |
--- a/dev-python/geopy/geopy-2.0.0.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,55 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI="7" |
36 |
- |
37 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
38 |
- |
39 |
-inherit distutils-r1 |
40 |
- |
41 |
-DESCRIPTION="A Geocoding Toolbox for Python" |
42 |
-HOMEPAGE=" |
43 |
- https://geopy.readthedocs.io |
44 |
- https://github.com/geopy/geopy |
45 |
- https://pypi.org/project/geopy |
46 |
-" |
47 |
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
48 |
- |
49 |
-LICENSE="MIT" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="~amd64" |
52 |
- |
53 |
-RDEPEND=" |
54 |
- <sci-geosciences/GeographicLib-2 |
55 |
- >=sci-geosciences/GeographicLib-1.49 |
56 |
-" |
57 |
-BDEPEND="test? ( |
58 |
- dev-python/pytest-aiohttp[${PYTHON_USEDEP}] |
59 |
- dev-python/mock[${PYTHON_USEDEP}] |
60 |
- dev-python/pytz[${PYTHON_USEDEP}] |
61 |
- dev-python/six[${PYTHON_USEDEP}] |
62 |
-)" |
63 |
- |
64 |
-distutils_enable_tests pytest |
65 |
-distutils_enable_sphinx docs \ |
66 |
- ">=dev-python/sphinx_rtd_theme-0.4.0" \ |
67 |
- dev-python/readme_renderer |
68 |
- |
69 |
-python_prepare_all() { |
70 |
- # [Errno -3] Temporary failure in name resolution |
71 |
- rm test/test_adapters.py || die |
72 |
- rm test/geocoders/algolia.py || die |
73 |
- rm test/geocoders/arcgis.py || die |
74 |
- rm test/geocoders/banfrance.py || die |
75 |
- rm test/geocoders/databc.py || die |
76 |
- rm test/geocoders/geocodefarm.py || die |
77 |
- rm test/geocoders/geonames.py || die |
78 |
- rm test/geocoders/nominatim.py || die |
79 |
- rm test/geocoders/photon.py || die |
80 |
- |
81 |
- # depend on the above and now fail to import |
82 |
- rm test/geocoders/openmapquest.py || die |
83 |
- rm test/geocoders/pickpoint.py || die |
84 |
- |
85 |
- distutils-r1_python_prepare_all |
86 |
-} |
87 |
|
88 |
diff --git a/dev-python/geopy/geopy-2.1.0.ebuild b/dev-python/geopy/geopy-2.1.0.ebuild |
89 |
index 4487a6ac5..d2745631b 100644 |
90 |
--- a/dev-python/geopy/geopy-2.1.0.ebuild |
91 |
+++ b/dev-python/geopy/geopy-2.1.0.ebuild |
92 |
@@ -3,7 +3,7 @@ |
93 |
|
94 |
EAPI="7" |
95 |
|
96 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
97 |
+PYTHON_COMPAT=( python3_{7..9} ) |
98 |
|
99 |
inherit distutils-r1 |
100 |
|
101 |
@@ -19,10 +19,7 @@ LICENSE="MIT" |
102 |
SLOT="0" |
103 |
KEYWORDS="~amd64" |
104 |
|
105 |
-RDEPEND=" |
106 |
- <sci-geosciences/GeographicLib-2 |
107 |
- >=sci-geosciences/GeographicLib-1.49 |
108 |
-" |
109 |
+RDEPEND="dev-python/geographiclib[${PYTHON_USEDEP}]" |
110 |
BDEPEND=" |
111 |
test? ( |
112 |
dev-python/pytest-aiohttp[${PYTHON_USEDEP}] |
113 |
@@ -38,21 +35,41 @@ distutils_enable_sphinx docs \ |
114 |
">=dev-python/sphinx_rtd_theme-0.4.0" \ |
115 |
dev-python/readme_renderer |
116 |
|
117 |
-python_prepare_all() { |
118 |
- # [Errno -3] Temporary failure in name resolution |
119 |
- rm test/test_adapters.py || die |
120 |
- rm test/geocoders/algolia.py || die |
121 |
- rm test/geocoders/arcgis.py || die |
122 |
- rm test/geocoders/banfrance.py || die |
123 |
- rm test/geocoders/databc.py || die |
124 |
- rm test/geocoders/geocodefarm.py || die |
125 |
- rm test/geocoders/geonames.py || die |
126 |
- rm test/geocoders/nominatim.py || die |
127 |
- rm test/geocoders/photon.py || die |
128 |
- |
129 |
- # depend on the above and now fail to import |
130 |
- rm test/geocoders/openmapquest.py || die |
131 |
- rm test/geocoders/pickpoint.py || die |
132 |
- |
133 |
- distutils-r1_python_prepare_all |
134 |
+python_test() { |
135 |
+ epytest \ |
136 |
+ --deselect test/test_adapters.py::test_not_available_adapters_raise \ |
137 |
+ --deselect test/test_adapters.py::test_geocoder_constructor_uses_https_proxy \ |
138 |
+ --deselect test/test_adapters.py::test_geocoder_https_proxy_auth_is_respected \ |
139 |
+ --deselect test/test_adapters.py::test_ssl_context_with_proxy_is_respected \ |
140 |
+ --deselect test/test_adapters.py::test_ssl_context_without_proxy_is_respected[URLLibAdapter] \ |
141 |
+ --deselect test/test_adapters.py::test_ssl_context_without_proxy_is_respected[RequestsAdapter] \ |
142 |
+ --deselect test/geocoders/algolia.py \ |
143 |
+ --deselect test/geocoders/arcgis.py \ |
144 |
+ --deselect test/geocoders/azure.py \ |
145 |
+ --deselect test/geocoders/baidu.py \ |
146 |
+ --deselect test/geocoders/banfrance.py \ |
147 |
+ --deselect test/geocoders/bing.py::TestBing \ |
148 |
+ --deselect test/geocoders/databc.py \ |
149 |
+ --deselect test/geocoders/geocodeearth.py \ |
150 |
+ --deselect test/geocoders/geocodefarm.py \ |
151 |
+ --deselect test/geocoders/geolake.py::TestGeolake \ |
152 |
+ --deselect test/geocoders/geonames.py::TestGeoNames \ |
153 |
+ --deselect test/geocoders/geonames.py::TestGeoNamesInvalidAccount \ |
154 |
+ --deselect test/geocoders/googlev3.py \ |
155 |
+ --deselect test/geocoders/here.py::TestHereApiKey \ |
156 |
+ --deselect test/geocoders/here.py::TestHereLegacyAuth \ |
157 |
+ --deselect test/geocoders/ignfrance.py \ |
158 |
+ --deselect test/geocoders/mapbox.py \ |
159 |
+ --deselect test/geocoders/mapquest.py \ |
160 |
+ --deselect test/geocoders/maptiler.py \ |
161 |
+ --deselect test/geocoders/nominatim.py \ |
162 |
+ --deselect test/geocoders/opencage.py::TestOpenCage \ |
163 |
+ --deselect test/geocoders/openmapquest.py::TestOpenMapQuest \ |
164 |
+ --deselect test/geocoders/pelias.py \ |
165 |
+ --deselect test/geocoders/photon.py \ |
166 |
+ --deselect test/geocoders/pickpoint.py \ |
167 |
+ --deselect test/geocoders/smartystreets.py::TestLiveAddress::test_geocode \ |
168 |
+ --deselect test/geocoders/tomtom.py \ |
169 |
+ --deselect test/geocoders/what3words.py \ |
170 |
+ --deselect test/geocoders/yandex.py |
171 |
} |