commit: 2bd565f99a9b48c428fad438c5026062c3142141 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Apr 26 19:46:16 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Apr 26 19:46:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd565f9
dev-python/pyproj: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pyproj/Manifest | 1 - .../pyproj/files/pyproj-2.6.1_p1-tests.patch | 58 ---------------------- dev-python/pyproj/pyproj-2.6.1_p1.ebuild | 52 ------------------- 3 files changed, 111 deletions(-) diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest index 46dcef39f4d..37f1b315049 100644 --- a/dev-python/pyproj/Manifest +++ b/dev-python/pyproj/Manifest @@ -1,2 +1 @@ -DIST pyproj-2.6.1.post1.tar.gz 545482 BLAKE2B ba87cbbe93dad357c1fc4f333c7d3f02b632e6f2a00821b3875e73965f36fd7ea958f24705c125c3ae43dc8edac1b53a20578c46bc55bcbf335a9457d193d493 SHA512 43a885dbbf4ba54839c3b697d2582700e2b30172ef34acf6297b5e4ddba9b3148aeab83b3a515f1ce975898828c77ad457b6f6460e91083189f66a2fde6d77b7 DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689 diff --git a/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch b/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch deleted file mode 100644 index 69eb97ea2e0..00000000000 --- a/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5856cdacef62746594e17f69cb802a202d3fdfaa Mon Sep 17 00:00:00 2001 -From: "Alan D. Snow" <alansno...@gmail.com> -Date: Fri, 29 May 2020 07:41:44 -0500 -Subject: TST: Update tests with scope & remarks (#649) - ---- - test/crs/test_crs.py | 16 +++++----------- - test/test_transformer.py | 10 +++++----- - 2 files changed, 10 insertions(+), 16 deletions(-) - ---- a/test/crs/test_crs.py -+++ b/test/crs/test_crs.py -@@ -1261,17 +1261,11 @@ def test_operations(): - - - def test_operations__scope_remarks(): -- -- transformer = TransformerGroup(28356, 7856).transformers[0] -- coord_op = CoordinateOperation.from_string(transformer.to_wkt()) -- assert coord_op.operations == transformer.operations -- # scope does not transfer for some reason -- # assert [op.scope for op in transformer.operations] == [ -- # op.scope for op in coord_op.operations -- # ] -- assert [op.remarks for op in transformer.operations] == [ -- op.remarks for op in coord_op.operations -- ] -+ operation = TransformerGroup(28356, 7856).transformers[0].operations[1] -+ coord_op = CoordinateOperation.from_string(operation.to_wkt()) -+ assert coord_op == operation -+ assert coord_op.remarks == operation.remarks -+ assert coord_op.scope == operation.scope - - - def test_crs_equals(): ---- a/test/test_transformer.py -+++ b/test/test_transformer.py -@@ -536,15 +536,15 @@ def test_transformer__operations__scope_ - transformer = TransformerGroup(28356, 7856).transformers[0] - assert transformer.scope is None - assert [op.scope for op in transformer.operations] == [ -- None, -+ "Large and medium scale topographic mapping and engineering survey.", - "Conformal transformation of GDA94 coordinates that have been derived through " - "GNSS CORS.", -- None, -+ "Large and medium scale topographic mapping and engineering survey.", - ] -- assert [str(op.remarks)[:5] for op in transformer.operations] == [ -- "None", -+ assert [str(op.remarks)[:5].strip() for op in transformer.operations] == [ -+ "Grid", - "Scale", -- "None", -+ "Grid", - ] - - diff --git a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild deleted file mode 100644 index 059a009b741..00000000000 --- a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 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="Python interface to the PROJ library" -HOMEPAGE="https://github.com/pyproj4/pyproj" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz" - -S="${WORKDIR}/${P/_p/.post}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" -IUSE="doc" - -RDEPEND=">=sci-libs/proj-6.2.0:=" -DEPEND="${RDEPEND} - dev-python/cython[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - sci-libs/shapely[${PYTHON_USEDEP}] - )" - -distutils_enable_sphinx docs dev-python/sphinx_rtd_theme -distutils_enable_tests pytest - -python_prepare_all() { - if has_version ">=sci-libs/proj-7.1"; then - eapply "${FILESDIR}"/${P}-tests.patch - fi - distutils-r1_python_prepare_all -} - -distutils-r1_src_test() { - # workaround circular import error - # https://github.com/pyproj4/pyproj/issues/647 - mkdir ../mytest || die - cp -r test ../mytest || die - cd ../mytest || die - _distutils-r1_run_foreach_impl python_test - _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info -} - -python_test() { - PROJ_LIB="${EPREFIX}/usr/share/proj" pytest -ra || die -}