1 |
commit: 2bd565f99a9b48c428fad438c5026062c3142141 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 26 19:46:16 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 26 19:46:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd565f9 |
7 |
|
8 |
dev-python/pyproj: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
dev-python/pyproj/Manifest | 1 - |
13 |
.../pyproj/files/pyproj-2.6.1_p1-tests.patch | 58 ---------------------- |
14 |
dev-python/pyproj/pyproj-2.6.1_p1.ebuild | 52 ------------------- |
15 |
3 files changed, 111 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest |
18 |
index 46dcef39f4d..37f1b315049 100644 |
19 |
--- a/dev-python/pyproj/Manifest |
20 |
+++ b/dev-python/pyproj/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST pyproj-2.6.1.post1.tar.gz 545482 BLAKE2B ba87cbbe93dad357c1fc4f333c7d3f02b632e6f2a00821b3875e73965f36fd7ea958f24705c125c3ae43dc8edac1b53a20578c46bc55bcbf335a9457d193d493 SHA512 43a885dbbf4ba54839c3b697d2582700e2b30172ef34acf6297b5e4ddba9b3148aeab83b3a515f1ce975898828c77ad457b6f6460e91083189f66a2fde6d77b7 |
23 |
DIST pyproj-3.0.1.tar.gz 168962 BLAKE2B 3271d604148c122f4dfdd68c4237e1911f30da7cc858128d644b6b6807c3e49450e0b42c385d37bbe1cfa5ab80d635e7f620d41bf5089af6b49a542eb9b3fcd0 SHA512 f5ae0ede1deaa93757cb98cc680d6e47a19b9f5c0ce5e357c2ecfe96f764ff59ec7285c606162da38573123d21f12f1df82354f1d2205149970af2d7d63c2689 |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index 69eb97ea2e0..00000000000 |
28 |
--- a/dev-python/pyproj/files/pyproj-2.6.1_p1-tests.patch |
29 |
+++ /dev/null |
30 |
@@ -1,58 +0,0 @@ |
31 |
-From 5856cdacef62746594e17f69cb802a202d3fdfaa Mon Sep 17 00:00:00 2001 |
32 |
-From: "Alan D. Snow" <alansnow21@×××××.com> |
33 |
-Date: Fri, 29 May 2020 07:41:44 -0500 |
34 |
-Subject: TST: Update tests with scope & remarks (#649) |
35 |
- |
36 |
---- |
37 |
- test/crs/test_crs.py | 16 +++++----------- |
38 |
- test/test_transformer.py | 10 +++++----- |
39 |
- 2 files changed, 10 insertions(+), 16 deletions(-) |
40 |
- |
41 |
---- a/test/crs/test_crs.py |
42 |
-+++ b/test/crs/test_crs.py |
43 |
-@@ -1261,17 +1261,11 @@ def test_operations(): |
44 |
- |
45 |
- |
46 |
- def test_operations__scope_remarks(): |
47 |
-- |
48 |
-- transformer = TransformerGroup(28356, 7856).transformers[0] |
49 |
-- coord_op = CoordinateOperation.from_string(transformer.to_wkt()) |
50 |
-- assert coord_op.operations == transformer.operations |
51 |
-- # scope does not transfer for some reason |
52 |
-- # assert [op.scope for op in transformer.operations] == [ |
53 |
-- # op.scope for op in coord_op.operations |
54 |
-- # ] |
55 |
-- assert [op.remarks for op in transformer.operations] == [ |
56 |
-- op.remarks for op in coord_op.operations |
57 |
-- ] |
58 |
-+ operation = TransformerGroup(28356, 7856).transformers[0].operations[1] |
59 |
-+ coord_op = CoordinateOperation.from_string(operation.to_wkt()) |
60 |
-+ assert coord_op == operation |
61 |
-+ assert coord_op.remarks == operation.remarks |
62 |
-+ assert coord_op.scope == operation.scope |
63 |
- |
64 |
- |
65 |
- def test_crs_equals(): |
66 |
---- a/test/test_transformer.py |
67 |
-+++ b/test/test_transformer.py |
68 |
-@@ -536,15 +536,15 @@ def test_transformer__operations__scope_ |
69 |
- transformer = TransformerGroup(28356, 7856).transformers[0] |
70 |
- assert transformer.scope is None |
71 |
- assert [op.scope for op in transformer.operations] == [ |
72 |
-- None, |
73 |
-+ "Large and medium scale topographic mapping and engineering survey.", |
74 |
- "Conformal transformation of GDA94 coordinates that have been derived through " |
75 |
- "GNSS CORS.", |
76 |
-- None, |
77 |
-+ "Large and medium scale topographic mapping and engineering survey.", |
78 |
- ] |
79 |
-- assert [str(op.remarks)[:5] for op in transformer.operations] == [ |
80 |
-- "None", |
81 |
-+ assert [str(op.remarks)[:5].strip() for op in transformer.operations] == [ |
82 |
-+ "Grid", |
83 |
- "Scale", |
84 |
-- "None", |
85 |
-+ "Grid", |
86 |
- ] |
87 |
- |
88 |
- |
89 |
|
90 |
diff --git a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild b/dev-python/pyproj/pyproj-2.6.1_p1.ebuild |
91 |
deleted file mode 100644 |
92 |
index 059a009b741..00000000000 |
93 |
--- a/dev-python/pyproj/pyproj-2.6.1_p1.ebuild |
94 |
+++ /dev/null |
95 |
@@ -1,52 +0,0 @@ |
96 |
-# Copyright 1999-2020 Gentoo Authors |
97 |
-# Distributed under the terms of the GNU General Public License v2 |
98 |
- |
99 |
-EAPI=7 |
100 |
- |
101 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
102 |
-inherit distutils-r1 |
103 |
- |
104 |
-DESCRIPTION="Python interface to the PROJ library" |
105 |
-HOMEPAGE="https://github.com/pyproj4/pyproj" |
106 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz" |
107 |
- |
108 |
-S="${WORKDIR}/${P/_p/.post}" |
109 |
- |
110 |
-LICENSE="MIT" |
111 |
-SLOT="0" |
112 |
-KEYWORDS="amd64 x86 ~amd64-linux" |
113 |
-IUSE="doc" |
114 |
- |
115 |
-RDEPEND=">=sci-libs/proj-6.2.0:=" |
116 |
-DEPEND="${RDEPEND} |
117 |
- dev-python/cython[${PYTHON_USEDEP}]" |
118 |
-BDEPEND=" |
119 |
- test? ( |
120 |
- dev-python/mock[${PYTHON_USEDEP}] |
121 |
- dev-python/numpy[${PYTHON_USEDEP}] |
122 |
- sci-libs/shapely[${PYTHON_USEDEP}] |
123 |
- )" |
124 |
- |
125 |
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme |
126 |
-distutils_enable_tests pytest |
127 |
- |
128 |
-python_prepare_all() { |
129 |
- if has_version ">=sci-libs/proj-7.1"; then |
130 |
- eapply "${FILESDIR}"/${P}-tests.patch |
131 |
- fi |
132 |
- distutils-r1_python_prepare_all |
133 |
-} |
134 |
- |
135 |
-distutils-r1_src_test() { |
136 |
- # workaround circular import error |
137 |
- # https://github.com/pyproj4/pyproj/issues/647 |
138 |
- mkdir ../mytest || die |
139 |
- cp -r test ../mytest || die |
140 |
- cd ../mytest || die |
141 |
- _distutils-r1_run_foreach_impl python_test |
142 |
- _distutils-r1_run_foreach_impl _distutils-r1_clean_egg_info |
143 |
-} |
144 |
- |
145 |
-python_test() { |
146 |
- PROJ_LIB="${EPREFIX}/usr/share/proj" pytest -ra || die |
147 |
-} |