Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
Date: Thu, 26 Aug 2021 15:31:21
Message-Id: 1629991873.a843c5da160e78c9936fd2b09b7c8e9008e5bb5b.mgorny@gentoo
1 commit: a843c5da160e78c9936fd2b09b7c8e9008e5bb5b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 26 15:27:11 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 26 15:31:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a843c5da
7
8 dev-python/xarray: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/xarray/Manifest | 3 -
13 .../xarray/files/xarray-0.18.2-backports.patch | 116 ---------------------
14 dev-python/xarray/xarray-0.17.0.ebuild | 42 --------
15 dev-python/xarray/xarray-0.18.1.ebuild | 42 --------
16 dev-python/xarray/xarray-0.18.2-r1.ebuild | 46 --------
17 5 files changed, 249 deletions(-)
18
19 diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
20 index 5cc33bb051e..20ed015ab11 100644
21 --- a/dev-python/xarray/Manifest
22 +++ b/dev-python/xarray/Manifest
23 @@ -1,4 +1 @@
24 -DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
25 -DIST xarray-0.18.1.tar.gz 2849935 BLAKE2B f4d510a049e67431737ba7f6a66fdd83061e6e5728ac6bfd3b9f104b24cc619cb1d0f05bbe6911e952c312ef229dbf1a68842b75dbb0ecf811fcc7d6e78569b0 SHA512 e1842d7bf06ee23716038fd58e7ae3a2014012cbc49394c9000272cb0498c1d333cbf3133b1d8fcdbddd524d44f6fa5fcc117c992d0ab1d3d0b9c4ddfc317847
26 -DIST xarray-0.18.2.tar.gz 2850065 BLAKE2B 16d8f5e10a7c9cb4247a3bc8f496f249d66235673e79d0707077e20b54a7d94a7b754fb00f44b876fa21273521f9e2e7d52183798ca33b8e62b30fbc57621c5a SHA512 3cfd6a3b77c48a73eb72e6c39db33aba266925df7ce9b8270231dd14032a717094073a2c3686b09fcff25313b548a452f9ed902211e254254389d15f025d8d0d
27 DIST xarray-0.19.0.tar.gz 2882403 BLAKE2B 454595076074c9805f0ff6f8b761a61e4c172445f2fd0bbcbd39a9615f3465704871fbc5f7c1a9c5fbb1c80b6c47cd677e590e1513ca88cd67908ef3502d234e SHA512 8f4ce7f770ea10e757112b722c7e7a56f19be2f885c63620d547cc54d8b625a5a23c5e603ba804c4d94f2a94863aad8351a9f6ef22ccbc1a78d77a549a21356e
28
29 diff --git a/dev-python/xarray/files/xarray-0.18.2-backports.patch b/dev-python/xarray/files/xarray-0.18.2-backports.patch
30 deleted file mode 100644
31 index be30702e67f..00000000000
32 --- a/dev-python/xarray/files/xarray-0.18.2-backports.patch
33 +++ /dev/null
34 @@ -1,116 +0,0 @@
35 -From ca72d56c213a1c47e54b12ee559f412e60fbf9b1 Mon Sep 17 00:00:00 2001
36 -From: Spencer Clark <spencerkclark@×××××.com>
37 -Date: Sat, 22 May 2021 20:13:19 -0400
38 -Subject: [PATCH] Make `kind` argument in `CFTimeIndex._maybe_cast_slice_bound`
39 - optional (#5359)
40 -
41 -* [test-upstream] Make kind argument in CFTimeIndex._maybe_cast_slice_bound optional
42 -
43 -* Update doc/whats-new.rst
44 -
45 -Co-authored-by: keewis <keewis@××××××××××××××××××××.com>
46 -
47 -Co-authored-by: keewis <keewis@××××××××××××××××××××.com>
48 ----
49 - doc/whats-new.rst | 4 ++++
50 - xarray/coding/cftimeindex.py | 9 +++++++--
51 - 2 files changed, 11 insertions(+), 2 deletions(-)
52 -
53 -diff --git a/xarray/coding/cftimeindex.py b/xarray/coding/cftimeindex.py
54 -index f0de5565..783fe8d0 100644
55 ---- a/xarray/coding/cftimeindex.py
56 -+++ b/xarray/coding/cftimeindex.py
57 -@@ -465,9 +465,14 @@ class CFTimeIndex(pd.Index):
58 - else:
59 - return pd.Index.get_loc(self, key, method=method, tolerance=tolerance)
60 -
61 -- def _maybe_cast_slice_bound(self, label, side, kind):
62 -+ def _maybe_cast_slice_bound(self, label, side, kind=None):
63 - """Adapted from
64 -- pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound"""
65 -+ pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound
66 -+
67 -+ Note that we have never used the kind argument in CFTimeIndex and it is
68 -+ deprecated as of pandas version 1.3.0. It exists only for compatibility
69 -+ reasons. We can remove it when our minimum version of pandas is 1.3.0.
70 -+ """
71 - if not isinstance(label, str):
72 - return label
73 -
74 ---
75 -2.32.0
76 -
77 -From 34dc57717c82a86455a9e5abb0a47df782266c7e Mon Sep 17 00:00:00 2001
78 -From: Mathias Hauser <mathause@××××××××××××××××××××.com>
79 -Date: Mon, 7 Jun 2021 23:05:24 +0200
80 -Subject: [PATCH] fix dask meta and output_dtypes error (#5449)
81 -
82 ----
83 - xarray/tests/test_computation.py | 5 ++++-
84 - 1 file changed, 4 insertions(+), 1 deletion(-)
85 -
86 -diff --git a/xarray/tests/test_computation.py b/xarray/tests/test_computation.py
87 -index b7ae1ca9..09bed724 100644
88 ---- a/xarray/tests/test_computation.py
89 -+++ b/xarray/tests/test_computation.py
90 -@@ -1306,7 +1306,10 @@ def test_vectorize_dask_dtype_without_output_dtypes(data_array):
91 - assert expected.dtype == actual.dtype
92 -
93 -
94 --@×××××××××××.xfail(LooseVersion(dask.__version__) < "2.3", reason="dask GH5274")
95 -+@×××××××××××.skipif(
96 -+ LooseVersion(dask.__version__) > "2021.06",
97 -+ reason="dask/dask#7669: can no longer pass output_dtypes and meta",
98 -+)
99 - @requires_dask
100 - def test_vectorize_dask_dtype_meta():
101 - # meta dtype takes precedence
102 ---
103 -2.32.0
104 -
105 -From 5a14d7d398be7e0efc6d5c8920dc8886212c3b2a Mon Sep 17 00:00:00 2001
106 -From: Spencer Clark <spencerkclark@×××××.com>
107 -Date: Sat, 12 Jun 2021 08:58:42 -0400
108 -Subject: [PATCH] Explicitly state datetime units in array constructors in
109 - `test_datetime_mean` (#5463)
110 -
111 ----
112 - xarray/tests/test_duck_array_ops.py | 10 ++++------
113 - 1 file changed, 4 insertions(+), 6 deletions(-)
114 -
115 -diff --git a/xarray/tests/test_duck_array_ops.py b/xarray/tests/test_duck_array_ops.py
116 -index 0eb00725..6d49e209 100644
117 ---- a/xarray/tests/test_duck_array_ops.py
118 -+++ b/xarray/tests/test_duck_array_ops.py
119 -@@ -285,15 +285,15 @@ def assert_dask_array(da, dask):
120 - def test_datetime_mean(dask):
121 - # Note: only testing numpy, as dask is broken upstream
122 - da = DataArray(
123 -- np.array(["2010-01-01", "NaT", "2010-01-03", "NaT", "NaT"], dtype="M8"),
124 -+ np.array(["2010-01-01", "NaT", "2010-01-03", "NaT", "NaT"], dtype="M8[ns]"),
125 - dims=["time"],
126 - )
127 - if dask:
128 - # Trigger use case where a chunk is full of NaT
129 - da = da.chunk({"time": 3})
130 -
131 -- expect = DataArray(np.array("2010-01-02", dtype="M8"))
132 -- expect_nat = DataArray(np.array("NaT", dtype="M8"))
133 -+ expect = DataArray(np.array("2010-01-02", dtype="M8[ns]"))
134 -+ expect_nat = DataArray(np.array("NaT", dtype="M8[ns]"))
135 -
136 - actual = da.mean()
137 - if dask:
138 -@@ -889,8 +889,6 @@ def test_push_dask():
139 - # some chunks of size-1 with NaN
140 - with raise_if_dask_computes():
141 - actual = push(
142 -- dask.array.from_array(array, chunks=(1, 2, 3, 2, 2, 1, 1)),
143 -- axis=0,
144 -- n=None,
145 -+ dask.array.from_array(array, chunks=(1, 2, 3, 2, 2, 1, 1)), axis=0, n=None
146 - )
147 - np.testing.assert_equal(actual, expected)
148 ---
149 -2.32.0
150 -
151
152 diff --git a/dev-python/xarray/xarray-0.17.0.ebuild b/dev-python/xarray/xarray-0.17.0.ebuild
153 deleted file mode 100644
154 index 4be25c37cc3..00000000000
155 --- a/dev-python/xarray/xarray-0.17.0.ebuild
156 +++ /dev/null
157 @@ -1,42 +0,0 @@
158 -# Copyright 1999-2021 Gentoo Authors
159 -# Distributed under the terms of the GNU General Public License v2
160 -
161 -EAPI=7
162 -
163 -# pkg_resources use in code
164 -DISTUTILS_USE_SETUPTOOLS=rdepend
165 -PYTHON_COMPAT=( python3_{7..9} )
166 -
167 -inherit distutils-r1
168 -
169 -DESCRIPTION="N-D labeled arrays and datasets in Python"
170 -HOMEPAGE="https://xarray.pydata.org/"
171 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
172 -
173 -LICENSE="Apache-2.0"
174 -SLOT="0"
175 -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
176 -
177 -RDEPEND="
178 - >=dev-python/numpy-1.17[${PYTHON_USEDEP}]
179 - >=dev-python/pandas-1.0[${PYTHON_USEDEP}]"
180 -# note: most of test dependencies are optional
181 -BDEPEND="
182 - test? (
183 - dev-python/bottleneck[${PYTHON_USEDEP}]
184 - dev-python/hypothesis[${PYTHON_USEDEP}]
185 - dev-python/matplotlib[${PYTHON_USEDEP}]
186 - dev-python/toolz[${PYTHON_USEDEP}]
187 - >=dev-python/scipy-1.4[${PYTHON_USEDEP}]
188 - )"
189 -
190 -distutils_enable_tests pytest
191 -
192 -python_test() {
193 - local deselect=(
194 - # warning-targeted tests are fragile and not important to end users
195 - xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
196 - )
197 -
198 - epytest ${deselect[@]/#/--deselect }
199 -}
200
201 diff --git a/dev-python/xarray/xarray-0.18.1.ebuild b/dev-python/xarray/xarray-0.18.1.ebuild
202 deleted file mode 100644
203 index f797bf1c514..00000000000
204 --- a/dev-python/xarray/xarray-0.18.1.ebuild
205 +++ /dev/null
206 @@ -1,42 +0,0 @@
207 -# Copyright 1999-2021 Gentoo Authors
208 -# Distributed under the terms of the GNU General Public License v2
209 -
210 -EAPI=7
211 -
212 -# pkg_resources use in code
213 -DISTUTILS_USE_SETUPTOOLS=rdepend
214 -PYTHON_COMPAT=( python3_{7..9} )
215 -
216 -inherit distutils-r1
217 -
218 -DESCRIPTION="N-D labeled arrays and datasets in Python"
219 -HOMEPAGE="https://xarray.pydata.org/"
220 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
221 -
222 -LICENSE="Apache-2.0"
223 -SLOT="0"
224 -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
225 -
226 -RDEPEND="
227 - >=dev-python/numpy-1.17[${PYTHON_USEDEP}]
228 - >=dev-python/pandas-1.0[${PYTHON_USEDEP}]"
229 -# note: most of test dependencies are optional
230 -BDEPEND="
231 - test? (
232 - dev-python/bottleneck[${PYTHON_USEDEP}]
233 - dev-python/hypothesis[${PYTHON_USEDEP}]
234 - dev-python/matplotlib[${PYTHON_USEDEP}]
235 - dev-python/toolz[${PYTHON_USEDEP}]
236 - >=dev-python/scipy-1.4[${PYTHON_USEDEP}]
237 - )"
238 -
239 -distutils_enable_tests pytest
240 -
241 -python_test() {
242 - local deselect=(
243 - # warning-targeted tests are fragile and not important to end users
244 - xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
245 - )
246 -
247 - epytest ${deselect[@]/#/--deselect }
248 -}
249
250 diff --git a/dev-python/xarray/xarray-0.18.2-r1.ebuild b/dev-python/xarray/xarray-0.18.2-r1.ebuild
251 deleted file mode 100644
252 index 510fc2c1b56..00000000000
253 --- a/dev-python/xarray/xarray-0.18.2-r1.ebuild
254 +++ /dev/null
255 @@ -1,46 +0,0 @@
256 -# Copyright 1999-2021 Gentoo Authors
257 -# Distributed under the terms of the GNU General Public License v2
258 -
259 -EAPI=7
260 -
261 -# pkg_resources use in code
262 -DISTUTILS_USE_SETUPTOOLS=rdepend
263 -PYTHON_COMPAT=( python3_{8..10} )
264 -
265 -inherit distutils-r1
266 -
267 -DESCRIPTION="N-D labeled arrays and datasets in Python"
268 -HOMEPAGE="https://xarray.pydata.org/"
269 -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
270 -
271 -LICENSE="Apache-2.0"
272 -SLOT="0"
273 -KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
274 -
275 -RDEPEND="
276 - >=dev-python/numpy-1.17[${PYTHON_USEDEP}]
277 - >=dev-python/pandas-1.0[${PYTHON_USEDEP}]"
278 -# note: most of test dependencies are optional
279 -BDEPEND="
280 - test? (
281 - dev-python/bottleneck[${PYTHON_USEDEP}]
282 - dev-python/hypothesis[${PYTHON_USEDEP}]
283 - dev-python/matplotlib[${PYTHON_USEDEP}]
284 - dev-python/toolz[${PYTHON_USEDEP}]
285 - >=dev-python/scipy-1.4[${PYTHON_USEDEP}]
286 - )"
287 -
288 -distutils_enable_tests pytest
289 -
290 -PATCHES=(
291 - "${FILESDIR}"/${P}-backports.patch
292 -)
293 -
294 -python_test() {
295 - local deselect=(
296 - # warning-targeted tests are fragile and not important to end users
297 - xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
298 - )
299 -
300 - epytest ${deselect[@]/#/--deselect }
301 -}