1 |
commit: b9c91185ba48ed4fa2360a143cd17cc9a560207a |
2 |
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 20 08:51:30 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 20 08:51:30 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c91185 |
7 |
|
8 |
dev-python/owslib: add 0.25.0, enable py3.10 |
9 |
|
10 |
- enable tests as network one |
11 |
- use pytest directly |
12 |
- cleanup of deps |
13 |
|
14 |
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> |
15 |
|
16 |
dev-python/owslib/Manifest | 1 + |
17 |
dev-python/owslib/owslib-0.20.0.ebuild | 13 ++++++--- |
18 |
.../{owslib-0.20.0.ebuild => owslib-0.25.0.ebuild} | 31 ++++++++++------------ |
19 |
3 files changed, 25 insertions(+), 20 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest |
22 |
index 8164041e6fb..052cb195f61 100644 |
23 |
--- a/dev-python/owslib/Manifest |
24 |
+++ b/dev-python/owslib/Manifest |
25 |
@@ -1 +1,2 @@ |
26 |
DIST owslib-0.20.0.tar.gz 912319 BLAKE2B 9f6e44f76554d67756839bfad1cdce6e2e7a4db6c3517ed308256745a3ea1df77488718f307bcd59dfcae7bab7801ba1974131f358db1bd070846640ccf08ada SHA512 c30e14d0a310617d2dbcca436f38d4a942b8c5efb96506554e650b20b34580fd0119ae6bf17892bb09ceff7141b9cbfd32deb582d14d81b6518dbbc223116d07 |
27 |
+DIST owslib-0.25.0.tar.gz 936550 BLAKE2B 9cb34a6c7c93dc89a466c13351d457c9372d405055fa3f6cec9c05c231e76762168c6813085523037b3a6439100500c46c1044569bd2bb598c3e2e63757d8b86 SHA512 058108cf77197ce24793608869d56bf0467230f5f231ac9ba48445f2e02d07ea1e26be03ad6967504a1e625008ae2768ed2a663f3b7a49dcea410ee4a8b40cec |
28 |
|
29 |
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.20.0.ebuild |
30 |
index 7349839b7ad..a5f26d6321d 100644 |
31 |
--- a/dev-python/owslib/owslib-0.20.0.ebuild |
32 |
+++ b/dev-python/owslib/owslib-0.20.0.ebuild |
33 |
@@ -1,9 +1,9 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
+# Copyright 1999-2021 Gentoo Authors |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
EAPI=7 |
39 |
|
40 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
41 |
+PYTHON_COMPAT=( python3_{8..10} ) |
42 |
inherit distutils-r1 |
43 |
|
44 |
DESCRIPTION="Library for client programming with Open Geospatial Consortium web service" |
45 |
@@ -34,9 +34,16 @@ DEPEND=" |
46 |
" |
47 |
|
48 |
RESTRICT="test" # tests require WAN access |
49 |
+PROPERTIES="test_network" |
50 |
|
51 |
PATCHES=( "${FILESDIR}/${P}-no-privacybreach.patch" ) |
52 |
|
53 |
+src_prepare() { |
54 |
+ sed -e '/addopts/d' -i tox.ini || die |
55 |
+ distutils-r1_src_prepare |
56 |
+} |
57 |
+ |
58 |
python_test() { |
59 |
- "${EPYTHON}" "${S}/setup.py" test || die |
60 |
+ epytest --tb=native --ignore=setup.py --doctest-modules --doctest-glob 'tests/**/*.txt' |
61 |
+ #"${EPYTHON}" "${S}/setup.py" test || die |
62 |
} |
63 |
|
64 |
diff --git a/dev-python/owslib/owslib-0.20.0.ebuild b/dev-python/owslib/owslib-0.25.0.ebuild |
65 |
similarity index 59% |
66 |
copy from dev-python/owslib/owslib-0.20.0.ebuild |
67 |
copy to dev-python/owslib/owslib-0.25.0.ebuild |
68 |
index 7349839b7ad..0ff537b6605 100644 |
69 |
--- a/dev-python/owslib/owslib-0.20.0.ebuild |
70 |
+++ b/dev-python/owslib/owslib-0.25.0.ebuild |
71 |
@@ -1,21 +1,21 @@ |
72 |
-# Copyright 1999-2020 Gentoo Authors |
73 |
+# Copyright 1999-2021 Gentoo Authors |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
|
76 |
-EAPI=7 |
77 |
+EAPI=8 |
78 |
|
79 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
80 |
+PYTHON_COMPAT=( python3_{8..10} ) |
81 |
inherit distutils-r1 |
82 |
|
83 |
DESCRIPTION="Library for client programming with Open Geospatial Consortium web service" |
84 |
HOMEPAGE="https://geopython.github.io/OWSLib/" |
85 |
SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
86 |
- |
87 |
S="${WORKDIR}/OWSLib-${PV}" |
88 |
|
89 |
LICENSE="BSD" |
90 |
SLOT="0" |
91 |
-KEYWORDS="amd64 x86" |
92 |
-IUSE="test" |
93 |
+KEYWORDS="~amd64 ~x86" |
94 |
+RESTRICT="test" |
95 |
+PROPERTIES="test_network" |
96 |
|
97 |
RDEPEND=" |
98 |
dev-python/lxml[${PYTHON_USEDEP}] |
99 |
@@ -25,18 +25,15 @@ RDEPEND=" |
100 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
101 |
dev-python/requests[${PYTHON_USEDEP}] |
102 |
" |
103 |
-DEPEND=" |
104 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
105 |
- test? ( |
106 |
- dev-python/pillow[${PYTHON_USEDEP}] |
107 |
- dev-python/pytest[${PYTHON_USEDEP}] |
108 |
- ) |
109 |
-" |
110 |
+BDEPEND="test? ( dev-python/pillow[${PYTHON_USEDEP}] )" |
111 |
|
112 |
-RESTRICT="test" # tests require WAN access |
113 |
+EPYTEST_DESELECT=( |
114 |
+ tests/test_ogcapi_features_pygeoapi.py::test_ogcapi_features_pygeoapi |
115 |
+) |
116 |
|
117 |
-PATCHES=( "${FILESDIR}/${P}-no-privacybreach.patch" ) |
118 |
+distutils_enable_tests pytest |
119 |
|
120 |
-python_test() { |
121 |
- "${EPYTHON}" "${S}/setup.py" test || die |
122 |
+src_prepare() { |
123 |
+ sed -e '/addopts/d' -i tox.ini || die |
124 |
+ distutils-r1_src_prepare |
125 |
} |