From b3e5a19871bcce1c20b6e0bb7e34e57ea5696a2c Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Mon, 7 Sep 2020 22:23:23 +0200 Subject: [PATCH] update geopy-2.0.0.ebuild --- CHANGELOG.txt | 4 ++ dev-python/geopy/Manifest | 9 ++-- dev-python/geopy/geopy-1.19.0.ebuild | 66 ---------------------------- dev-python/geopy/geopy-1.20.0.ebuild | 66 ---------------------------- dev-python/geopy/geopy-1.21.0.ebuild | 2 +- dev-python/geopy/geopy-2.0.0.ebuild | 33 ++++++++++++++ dev-python/geopy/metadata.xml | 16 +++---- 7 files changed, 49 insertions(+), 147 deletions(-) delete mode 100644 dev-python/geopy/geopy-1.19.0.ebuild delete mode 100644 dev-python/geopy/geopy-1.20.0.ebuild create mode 100644 dev-python/geopy/geopy-2.0.0.ebuild diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0874b57c5..f1b7bf835 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +2020-09-07 + * update geopy-2.0.0.ebuild + + 2020-09-06 * cleanup ruamel-yaml, only 0.15.100 is still needed * astroid-2.3.3: romove obsolete patch diff --git a/dev-python/geopy/Manifest b/dev-python/geopy/Manifest index 087d10d29..6b2bed567 100644 --- a/dev-python/geopy/Manifest +++ b/dev-python/geopy/Manifest @@ -1,8 +1,7 @@ -DIST geopy-1.19.0.tar.gz 251957 BLAKE2B 59aed0677ea761eb11d82a6cadbff8d22ce6a7d5573c32e80b99c67d8336a7a44a7cfdfc06698ea7cb646249898a202c055fc398010930297eccd960649484c4 SHA512 c1cfbb3404c62168c964ad6d1252567c6e9b4d92657b2a170f0f4db7f2035f486e0205250cd9f7adf68e012e095070d511982f04409d145a1c8c03a5c99dabf0 DIST geopy-1.20.0.tar.gz 252386 BLAKE2B 684d1651a28aa1a72317c9afc5c0f4dde0340eb5cef45dea28c956aa15ebc5fff2f55947b4eee5781ff6142dd1f34d4db2c9b5497b1864e3a986cc40ba064824 SHA512 c8aae44f6fd403c4a48bbf865293bfaa2de332b61324fd0fc9498a0d77b78b0512441b33b34159184477a385aac5f9d90ae57892c0f0d670e36cc74e106cbcd5 DIST geopy-1.21.0.tar.gz 254831 BLAKE2B 2b8aa46277ea65cde2e037ee71d42ef42451d1ee3bc38b7a6f89e15293074f80cf52b53bad6a483769fe8ce6d267db27bd1878e6248c0c4b18a92a86df4a2ae9 SHA512 8dc148795251e5bf74948859430856569e7aef38ac09432f86498ec3f5939277d2d548f3c35c6f14e6ef1645fdfa48bf70ab998888ba395f199c08aa8dbe6ed2 -EBUILD geopy-1.19.0.ebuild 2286 BLAKE2B 8b9edcae23a0125b56126be8ff0472ab901840396f1ae567a6fb6aa395f6267c8b597c866a49f6ef1063b1ca7caa9c08d83263406065c9e45326ebca651e2f7b SHA512 ab8d78ec718a3f76cddd72727118184176e977e22c119c8cd74595cb0dd9fa019b2bf911e043dce7e1112b90ef05267cdd7a3fa7a5af09d97508b603d8be36f2 +DIST geopy-2.0.0.tar.gz 107026 BLAKE2B d145279603e6b47d52879057950bd16cc78ff21068f31aeabc67ab116bec09dbc2a45e5b548eab75f4099c5de7450dfee31edc54f1cb48e6532e866e6c9cadc3 SHA512 99411b42d8878736a1bd1de5b5eca4d037fea4d465bb8a689d9da99fb9f186dae32d59985ee9ae95eed1094edd7fa2af12e8c69cf63c8c6770aa1266f8de975d EBUILD geopy-1.20.0-r1.ebuild 2320 BLAKE2B 5450ad6d3bcba23639740b95b6ea4ccdad12af8417d84af43745bc8a247a656afb28d292d8b456bb18ee29a280a8e1ac35e3b11df0036912dfef5a49fe8e1921 SHA512 3dc91a75b6bbc9545c82f5969ff1a8604dac219c946114f73f2078f01aa72ac0fd982241004e415529f65dddb08c04049897663c18fbafd3a0eb49f217414e00 -EBUILD geopy-1.20.0.ebuild 2286 BLAKE2B 8b9edcae23a0125b56126be8ff0472ab901840396f1ae567a6fb6aa395f6267c8b597c866a49f6ef1063b1ca7caa9c08d83263406065c9e45326ebca651e2f7b SHA512 ab8d78ec718a3f76cddd72727118184176e977e22c119c8cd74595cb0dd9fa019b2bf911e043dce7e1112b90ef05267cdd7a3fa7a5af09d97508b603d8be36f2 -EBUILD geopy-1.21.0.ebuild 2320 BLAKE2B 5450ad6d3bcba23639740b95b6ea4ccdad12af8417d84af43745bc8a247a656afb28d292d8b456bb18ee29a280a8e1ac35e3b11df0036912dfef5a49fe8e1921 SHA512 3dc91a75b6bbc9545c82f5969ff1a8604dac219c946114f73f2078f01aa72ac0fd982241004e415529f65dddb08c04049897663c18fbafd3a0eb49f217414e00 -MISC metadata.xml 566 BLAKE2B ea35386f802c3a3d619e8531eabad55dfcc4da3ce7895859aab57bba610f52bee9f026513ca8a983a19a7eb52e6464240d629577381e1ba0030dfd4c8577a659 SHA512 37c883926b9a90ea8357aa2c307bef10ce6f419acb6bae4f4bef43604e699476dc1d5a258a3279e3b029d16097168bda3beeec924111fbe185be82017dbb8843 +EBUILD geopy-1.21.0.ebuild 2321 BLAKE2B c43a562b743c34357faddce219796914e7e0230e839afb451b6c258b061fbff67a0dbc05e41aa286f5a208e443cea9fb3ae47d550b2653cfa72f6e06d4aa7f87 SHA512 6b7ac03331cc02b0bd5bcf23065d4dc339ff3b763b5afe95ca3ca388eb7939043e03a5fe800be5c4bd8bef46ca8172925136b461120c7624e8e6df5fb74a90f3 +EBUILD geopy-2.0.0.ebuild 799 BLAKE2B d49331a5cdd695b295a20c4a8d0d685f9614f6d2e9e0002e8f956144271599e352e7e3f687c4042f074b3a2f33e46ac03ff9e36fc7d0a06488ad98a7841e01a5 SHA512 cefa2eef2e5408eb77e8db3ae9689c085582d569f883f9f0addc450804b777956e6d3e6d5473f4f4cff06b2606af8a67eddf8ca9fb9a33198bd2b88bd0887149 +MISC metadata.xml 449 BLAKE2B dafff0aa78f14e7fda69991dd573ae4b293af8a3ce9f846f01f95618dd18f286b6e37605b1425d812825cd8861dd9ab75d3ce5f12a7e71ac6769a1d3f82358c9 SHA512 af7b5f15f30d494423a32a6129aed8c29f3606b2f4002abc4503c444fd2016731608c61adeecd6aa362213ede74d2f92ebfeba5a2da3b5ceae8a5aa2d2f16d21 diff --git a/dev-python/geopy/geopy-1.19.0.ebuild b/dev-python/geopy/geopy-1.19.0.ebuild deleted file mode 100644 index d0aee6098..000000000 --- a/dev-python/geopy/geopy-1.19.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit distutils-r1 - -DESCRIPTION="A Geocoding Toolbox for Python" -HOMEPAGE="https://www.geopy.org/ https://github.com/geopy/geopy" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -IUSE="test doc timezone yahoo" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}] - dev-python/placefinder[${PYTHON_USEDEP}] ) - timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/nose-cover3[${PYTHON_USEDEP}] - dev-python/pylint[${PYTHON_USEDEP}] ) - doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7) - >=dev-python/python-docs-2.7.6-r1:2.7 )" - -REQUIRED_USE="test? ( yahoo timezone )" - -python_prepare_all() { - if use doc; then - local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) - local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" - local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" - local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die - fi - - distutils-r1_python_prepare_all - - # prevent install of test folder to avoid file collisions - sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die -} - -python_test() { - # broken tests - rm test/geocoders/openmapquest.py - sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py - # Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite - # i.e. "You should provide an api key and a username with a password" - # Cannot decipher how to skip or exclude this "context=IGNFranceTestCase" - # It appears it MAY stem from nose rather than geopy's suite - nosetests --verbose || die "Tests failed under ${EPYTHON}" -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/geopy/geopy-1.20.0.ebuild b/dev-python/geopy/geopy-1.20.0.ebuild deleted file mode 100644 index d0aee6098..000000000 --- a/dev-python/geopy/geopy-1.20.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit distutils-r1 - -DESCRIPTION="A Geocoding Toolbox for Python" -HOMEPAGE="https://www.geopy.org/ https://github.com/geopy/geopy" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -IUSE="test doc timezone yahoo" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}] - dev-python/placefinder[${PYTHON_USEDEP}] ) - timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/nose-cover3[${PYTHON_USEDEP}] - dev-python/pylint[${PYTHON_USEDEP}] ) - doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7) - >=dev-python/python-docs-2.7.6-r1:2.7 )" - -REQUIRED_USE="test? ( yahoo timezone )" - -python_prepare_all() { - if use doc; then - local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) - local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" - local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" - local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed -i "s|'https://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die - fi - - distutils-r1_python_prepare_all - - # prevent install of test folder to avoid file collisions - sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die -} - -python_test() { - # broken tests - rm test/geocoders/openmapquest.py - sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py - # Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite - # i.e. "You should provide an api key and a username with a password" - # Cannot decipher how to skip or exclude this "context=IGNFranceTestCase" - # It appears it MAY stem from nose rather than geopy's suite - nosetests --verbose || die "Tests failed under ${EPYTHON}" -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/geopy/geopy-1.21.0.ebuild b/dev-python/geopy/geopy-1.21.0.ebuild index 6bf20ecd0..dec2d467c 100644 --- a/dev-python/geopy/geopy-1.21.0.ebuild +++ b/dev-python/geopy/geopy-1.21.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="A Geocoding Toolbox for Python" HOMEPAGE="https://www.geopy.org/ https://github.com/geopy/geopy" SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -IUSE="test doc timezone yahoo" +IUSE="test doc timezone -yahoo" LICENSE="MIT" SLOT="0" diff --git a/dev-python/geopy/geopy-2.0.0.ebuild b/dev-python/geopy/geopy-2.0.0.ebuild new file mode 100644 index 000000000..78f682310 --- /dev/null +++ b/dev-python/geopy/geopy-2.0.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{6..8} ) + +inherit distutils-r1 + +DESCRIPTION="Python Geocoding Toolbox" +HOMEPAGE="https://github.com/geopy/geopy https://pypi.org/project/geopy/" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="test" + +RDEPEND="sci-geosciences/GeographicLib + dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}]" +BDEPEND="${REDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +python_test() { + nosetests --verbose || die + py.test -v -v || die +} diff --git a/dev-python/geopy/metadata.xml b/dev-python/geopy/metadata.xml index 8e4022f6f..13b5fcdfc 100644 --- a/dev-python/geopy/metadata.xml +++ b/dev-python/geopy/metadata.xml @@ -1,17 +1,15 @@ - + - python@gentoo.org - Python + b@edevau.net + Andreas Billmeier - geopy geopy - geopy/geopy + + kostya@esmukov.ru + Kostya Esmukov + - - Enables use of YahooPlaceFinder - Enables localized date support -