From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-python/pyproj/Manifest | 5 +- .../pyproj/files/pyproj-2.6.1_p1-tests.patch | 58 ---------------------- dev-python/pyproj/pyproj-2.6.1_p1.ebuild | 52 ------------------- dev-python/pyproj/pyproj-3.0.1.ebuild | 2 +- 4 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch delete mode 100644 dev-python/pyproj/pyproj-2.6.1_p1.ebuild (limited to 'dev-python/pyproj') diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest index e4a6ae079732..2b0171424d2f 100644 --- a/dev-python/pyproj/Manifest +++ b/dev-python/pyproj/Manifest @@ -1,6 +1,3 @@ -AUX pyproj-2.6.1_p1-tests.patch 2132 BLAKE2B 6d516cddb5b5bab0778a68d12025726e37871f49d34d7136905ecc17120d8436d5ef8f5304f1ea5ed35d25468a0116b72db01f0c3c627e9c4338ec57b58e22b2 SHA512 3678c9ae5c0793d0c33f64ebf473dc051e49437db1cad35b21ec11861ef19c1164987eaf8fe11e7883ebd28d5a81e073550bba380c5282cee6e44fd54cb9b2ee -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 -EBUILD pyproj-2.6.1_p1.ebuild 1252 BLAKE2B 7592e15a884fc7da5d2e49908f7aaec16b2e649a1346b86ebaf905cabcb7187120491ee2f70fff0a0574783516398972a8b0e5f148a74ba8f1d535e93e5de3cc SHA512 231cdc338240645051c972740a7424d145a51732d9556051004bc429685a7a5d8444642e320d510f7c406c0e4b5529db6ab31073b6a0aa5fb2ea750ad663b80d -EBUILD pyproj-3.0.1.ebuild 1456 BLAKE2B 3807d40ff44314a5cf231267dcaf3b4e26d99c8510e8f4d31f790f39c6cf3e6221bcc83668e23f5c85362540f2be390fd499dfb507fa410b502f971bc4bcc16d SHA512 97471be094eb91888631c09079ffec12c5ccafb655a2920debf85c8a309e1eb7c5c5f36e962f3ef064a328be4e81ea9b9586f91617fa4e3636fb53dbef6bfd8f +EBUILD pyproj-3.0.1.ebuild 1454 BLAKE2B baa1dd99d0e3c02662f1ea337583912d1d1978f4577dd548f1c7d12c6d7d539098324525d63bcaecc7eed9e2cbcc87bd0c80df36430e28d071897f5cf8b7a455 SHA512 45244a36fb061eb99c8fd56ab3e44aa047689e48e9279c2df2e26ad1f10271d2e67ed5eaf335d61e108e8e0ad86d9ad92ce2fc8cb7f8d2fead5f1f6e4faa750c MISC metadata.xml 414 BLAKE2B 37b554706874ecf474f6fde6c09e4d7e466f2a22527e2851d3766518d0044dbbd2211f291851564541394a4d8f7d37f8216ae1c50cab8f662d3335d58c1ea142 SHA512 c117112962969a1cee0a9c3c7ec86942bfca1ef3eb9859b079ebdac743b691a954d7dc55ec729e141336c253abff8e0c7fcf1625279990cb87da87d732efe881 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 69eb97ea2e04..000000000000 --- 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" -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 059a009b7417..000000000000 --- 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 -} diff --git a/dev-python/pyproj/pyproj-3.0.1.ebuild b/dev-python/pyproj/pyproj-3.0.1.ebuild index af1f8f54b07d..23672a0d5ffc 100644 --- a/dev-python/pyproj/pyproj-3.0.1.ebuild +++ b/dev-python/pyproj/pyproj-3.0.1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P/_p/.post}" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" +KEYWORDS="amd64 x86 ~amd64-linux" RDEPEND=">=sci-libs/proj-7.2.0:=" BDEPEND=" -- cgit v1.2.3