[gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
commit: d3a7d3cb50324e8505b6e1e31dd65f0850e5c80d
Author: Michał Górny gentoo org>
AuthorDate: Thu Jun 20 11:19:33 2024 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jun 20 11:48:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a7d3cb
dev-python/xarray: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/xarray/Manifest | 2 -
.../xarray/files/xarray-2024.1.1-pytest-8.patch| 77 --
dev-python/xarray/xarray-2024.1.1-r1.ebuild| 92 --
dev-python/xarray/xarray-2024.2.0-r1.ebuild| 92 --
dev-python/xarray/xarray-2024.3.0-r1.ebuild| 77 --
5 files changed, 340 deletions(-)
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 133f894540fd..567366ec64c7 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,3 @@
DIST xarray-2024.03.0.gh.tar.gz 3722922 BLAKE2B
52025d8ba196500ac989fc8ff85ae7578cae3602ede77b663350acf0e132d2d9358f3170c697aa2f158c2f3f3520607c23f9060356fec0942ebddb9ca3e039da
SHA512
5d62c102a3fdf6dfc16182d3822386dc9edb75204dff9a9b8e3aa7bbe5b223c477f2a73f0a0e35de3454d9e738da6205da0c308bc778f8ffc9af80c20a49d6af
-DIST xarray-2024.1.1.tar.gz 3614037 BLAKE2B
cc50fbfa19a2c9229b85b8c7d5d0e7e7f6d3e5a484955fcc81aa0b37839a0b992d2c2f928e4097ca05c7b8294ed1061fbd0c1b7e7c65c9087a940dab97c520ce
SHA512
b6447ca2c80b3a3091ac2baba648fef4faa79272360e9726b318b517ede9d2717d1b6f77f03fdacf55527233f1a37c0d114901fe1a265d3e435cf293a487
-DIST xarray-2024.2.0.tar.gz 3634288 BLAKE2B
8d1165360300da5af6d670947e5280052a3d8915768e02448b86ab38283d6d45258a2c4eb91982ba732ccedb3a7afc5f274116c9ee0072d35cdc5631b8a2ca50
SHA512
dcfe6d1f0edab8659664c5399b96d622d2e3df2f85bb7672d9afab6f74294a6449772efde080aaa7323f733c09cbd0f6f037e547be0afa79f39450eead777828
DIST xarray-2024.5.0.tar.gz 3710689 BLAKE2B
04d2d9c70c90bccd0f269dde91be8a3f213b2dfe2d380b041abe946d118e80d0816ef09ed7e225b7bb164902c1943c1be335f1cac815d12c4aace6a0217379bb
SHA512
d3aa6ef73afd2fd8a5c5551631ca5385d14221474bdab4c404cee1405b370c2f998c895bfd3506e6ccc1b2f511996b0eebefb331768df047d5e8b398ad2f9199
DIST xarray-2024.6.0.tar.gz 3715179 BLAKE2B
42fa46883d27f656dca9b82e1647bd94a62a427582cd52d847131a8e01caf77a597fcc128453fee1f68c38897a9f995dd4c644e9b68b551ee1c28bc0d48e9465
SHA512
b6f24f834d71cca84f6a485858571a17bcb250915d4f84c886c9e16fc240ae3c3e91d573726e8a09f1dbe269abbfae97498868476eef1a90813ddb29c6a6db62
diff --git a/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
b/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
deleted file mode 100644
index e85bb6de7b71..
--- a/dev-python/xarray/files/xarray-2024.1.1-pytest-8.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 306a50e344522a3f321d49d95488f457975fa553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
-Date: Wed, 31 Jan 2024 11:31:26 +0100
-Subject: [PATCH 1/2] test_dataset: remove incorrect pytest.warns() to fix
- pytest-8
-
-Remove two incorrect `pytest.warns()` assertions to fix test failures
-with pytest-8.0.0. Prior to this version, an exception raised would
-cause `pytest.warns()` to be ignored. This way fixed in 8.0.0, and now
-warnings must actually be emitted prior to the exception.
-
-In `test_drop_index_labels()`, the exception is raised at the very
-beginning of the function, prior to the deprecation warning.
-
-In `test_rename_multiindex()`, the warning is not emitted at all (it is
-not applicable to the call in question).
- xarray/tests/test_dataset.py | 6 ++
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/xarray/tests/test_dataset.py b/xarray/tests/test_dataset.py
-index fa9448f2f4..77d172f00b 100644
a/xarray/tests/test_dataset.py
-+++ b/xarray/tests/test_dataset.py
-@@ -2724,8 +2724,7 @@ def test_drop_index_labels(self) -> None:
- assert_identical(data, actual)
-
- with pytest.raises(ValueError):
--with pytest.warns(DeprecationWarning):
--data.drop(["c"], dim="x", errors="wrong_value") # type:
ignore[arg-type]
-+data.drop(["c"], dim="x", errors="wrong_value") # type:
ignore[arg-type]
-
- with pytest.warns(DeprecationWarning):
- actual = data.drop(["a", "b", "c"], "x", errors="ignore")
-@@ -3159,8 +3158,7 @@ def test_rename_multiindex(self) -> None:
- original.rename({"a": "x"})
-
- with pytest.raises(ValueError, match=r"'b' conflicts"):
--with pytest.warns(UserWarning, match="does not create an index
anymore"):
--original.rename({"a": "b"})
-+original.rename({"a": "b"})
-
- def test_rename_perserve_attrs_encoding(self) -> None:
- # test propagate attrs/encoding to new variable(s) created from Index
object
-
-From 3bc5abf4da35edda1f0c3e9e0d53e39331c1a76b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
[gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
commit: 068011336887538ab57b92e7ff30acf50ab43b37
Author: Michał Górny gentoo org>
AuthorDate: Thu Sep 22 07:44:32 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Sep 22 07:45:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06801133
dev-python/xarray: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/xarray/Manifest | 1 -
.../files/xarray-0.19.0-riscv_tests_datetime.patch | 73 --
dev-python/xarray/xarray-2022.3.0.ebuild | 42 -
3 files changed, 116 deletions(-)
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 83ffaa877fbd..1e93d52b801d 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1 @@
-DIST xarray-2022.3.0.tar.gz 2943007 BLAKE2B
4c323573835c00275b9c293157c78e42d14f2736c07dc06c61643052992b9c75d624cdf9a93487094fbffd9577662388807b661d388032add3b2e2ca3a63b812
SHA512
c088b985a852c57dcef14d8a5107987c0c33f17bde1d9d639d30ac826d906639ce0ee4fe8345c65a5479b944057af045fe50c2d2ea932356aceb0718f55cd24a
DIST xarray-2022.6.0.tar.gz 3013166 BLAKE2B
4f2c17595ec904508e5f9c1d6ffead45be527b7f2ab73383126d57c7894712e924b605a86f890b0fec4ff45d1a263ce27fa324febf83f703ad36079e68f69663
SHA512
415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
diff --git a/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
b/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
deleted file mode 100644
index 1f356e95b561..
--- a/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-These tests are x86{_64}-centric because they rely on a specific result of
-casting a float64 NaN to int64, which is undefined in the C standard.
-See https://github.com/numpy/numpy/issues/8325 for details.
-
a/xarray/tests/__init__.py
-+++ b/xarray/tests/__init__.py
-@@ -40,6 +40,12 @@
- )
-
-
-+riscv_xfail = pytest.mark.xfail(
-+"riscv" in platform.machine(),
-+reason="expected failure on RISC-V",
-+)
-+
-+
- def _importorskip(modname, minversion=None):
- try:
- mod = importlib.import_module(modname)
a/xarray/tests/test_backends.py
-+++ b/xarray/tests/test_backends.py
-@@ -71,6 +71,7 @@
- requires_scipy,
- requires_scipy_or_netCDF4,
- requires_zarr,
-+riscv_xfail,
- )
- from .test_coding_times import (
- _ALL_CALENDARS,
-@@ -492,6 +493,7 @@
- assert actual["x"].encoding["_Encoding"] == "ascii"
-
- @arm_xfail
-+@riscv_xfail
- def test_roundtrip_numpy_datetime_data(self):
- times = pd.to_datetime(["2000-01-01", "2000-01-02", "NaT"])
- expected = Dataset({"t": ("t", times), "t0": times[0]})
a/xarray/tests/test_coding_times.py
-+++ b/xarray/tests/test_coding_times.py
-@@ -36,6 +36,7 @@
- requires_cftime,
- requires_cftime_1_4_1,
- requires_dask,
-+riscv_xfail,
- )
-
- _NON_STANDARD_CALENDARS_SET = {
-@@ -466,6 +467,7 @@
-
-
- @arm_xfail
-+@riscv_xfail
- @requires_cftime
- @pytest.mark.parametrize(
- ["num_dates", "units", "expected_list"],
a/xarray/tests/test_duck_array_ops.py
-+++ b/xarray/tests/test_duck_array_ops.py
-@@ -38,6 +38,7 @@
- requires_bottleneck,
- requires_cftime,
- requires_dask,
-+riscv_xfail,
- )
-
-
-@@ -280,6 +281,7 @@
-
-
- @arm_xfail
-+@riscv_xfail
- @pytest.mark.filterwarnings("ignore::RuntimeWarning")
- @pytest.mark.parametrize("dask", [False, True] if has_dask else [False])
- def test_datetime_mean(dask):
diff --git a/dev-python/xarray/xarray-2022.3.0.ebuild
b/dev-python/xarray/xarray-2022.3.0.ebuild
deleted file mode 100644
index 6394aa2d7491..
--- a/dev-python/xarray/xarray-2022.3.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/;
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86
~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/numpy-1.18[${PYTHON_USEDEP}]
- >=dev-python/pandas-1.1[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]"
-# note: most of test dependencies are optional
-BDEPEND="
- test? (
- dev-python/bottleneck[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/toolz[${PYTHON_USEDEP}]
- !hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
-)
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
commit: a843c5da160e78c9936fd2b09b7c8e9008e5bb5b Author: Michał Górny gentoo org> AuthorDate: Thu Aug 26 15:27:11 2021 + Commit: Michał Górny gentoo org> CommitDate: Thu Aug 26 15:31:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a843c5da dev-python/xarray: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/xarray/Manifest | 3 - .../xarray/files/xarray-0.18.2-backports.patch | 116 - dev-python/xarray/xarray-0.17.0.ebuild | 42 dev-python/xarray/xarray-0.18.1.ebuild | 42 dev-python/xarray/xarray-0.18.2-r1.ebuild | 46 5 files changed, 249 deletions(-) diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest index 5cc33bb051e..20ed015ab11 100644 --- a/dev-python/xarray/Manifest +++ b/dev-python/xarray/Manifest @@ -1,4 +1 @@ -DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34 -DIST xarray-0.18.1.tar.gz 2849935 BLAKE2B f4d510a049e67431737ba7f6a66fdd83061e6e5728ac6bfd3b9f104b24cc619cb1d0f05bbe6911e952c312ef229dbf1a68842b75dbb0ecf811fcc7d6e78569b0 SHA512 e1842d7bf06ee23716038fd58e7ae3a2014012cbc49394c9000272cb0498c1d333cbf3133b1d8fcdbddd524d44f6fa5fcc117c992d0ab1d3d0b9c4ddfc317847 -DIST xarray-0.18.2.tar.gz 2850065 BLAKE2B 16d8f5e10a7c9cb4247a3bc8f496f249d66235673e79d0707077e20b54a7d94a7b754fb00f44b876fa21273521f9e2e7d52183798ca33b8e62b30fbc57621c5a SHA512 3cfd6a3b77c48a73eb72e6c39db33aba266925df7ce9b8270231dd14032a717094073a2c3686b09fcff25313b548a452f9ed902211e254254389d15f025d8d0d DIST xarray-0.19.0.tar.gz 2882403 BLAKE2B 454595076074c9805f0ff6f8b761a61e4c172445f2fd0bbcbd39a9615f3465704871fbc5f7c1a9c5fbb1c80b6c47cd677e590e1513ca88cd67908ef3502d234e SHA512 8f4ce7f770ea10e757112b722c7e7a56f19be2f885c63620d547cc54d8b625a5a23c5e603ba804c4d94f2a94863aad8351a9f6ef22ccbc1a78d77a549a21356e diff --git a/dev-python/xarray/files/xarray-0.18.2-backports.patch b/dev-python/xarray/files/xarray-0.18.2-backports.patch deleted file mode 100644 index be30702e67f..000 --- a/dev-python/xarray/files/xarray-0.18.2-backports.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ca72d56c213a1c47e54b12ee559f412e60fbf9b1 Mon Sep 17 00:00:00 2001 -From: Spencer Clark -Date: Sat, 22 May 2021 20:13:19 -0400 -Subject: [PATCH] Make `kind` argument in `CFTimeIndex._maybe_cast_slice_bound` - optional (#5359) - -* [test-upstream] Make kind argument in CFTimeIndex._maybe_cast_slice_bound optional - -* Update doc/whats-new.rst - -Co-authored-by: keewis - -Co-authored-by: keewis - doc/whats-new.rst| 4 - xarray/coding/cftimeindex.py | 9 +++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/xarray/coding/cftimeindex.py b/xarray/coding/cftimeindex.py -index f0de5565..783fe8d0 100644 a/xarray/coding/cftimeindex.py -+++ b/xarray/coding/cftimeindex.py -@@ -465,9 +465,14 @@ class CFTimeIndex(pd.Index): - else: - return pd.Index.get_loc(self, key, method=method, tolerance=tolerance) - --def _maybe_cast_slice_bound(self, label, side, kind): -+def _maybe_cast_slice_bound(self, label, side, kind=None): - """Adapted from --pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound""" -+pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound -+ -+Note that we have never used the kind argument in CFTimeIndex and it is -+deprecated as of pandas version 1.3.0. It exists only for compatibility -+reasons. We can remove it when our minimum version of pandas is 1.3.0. -+""" - if not isinstance(label, str): - return label - --- -2.32.0 - -From 34dc57717c82a86455a9e5abb0a47df782266c7e Mon Sep 17 00:00:00 2001 -From: Mathias Hauser -Date: Mon, 7 Jun 2021 23:05:24 +0200 -Subject: [PATCH] fix dask meta and output_dtypes error (#5449) - - xarray/tests/test_computation.py | 5 - - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/xarray/tests/test_computation.py b/xarray/tests/test_computation.py -index b7ae1ca9..09bed724 100644 a/xarray/tests/test_computation.py -+++ b/xarray/tests/test_computation.py -@@ -1306,7 +1306,10 @@ def test_vectorize_dask_dtype_without_output_dtypes(data_array): - assert expected.dtype == actual.dtype - - --@pytest.mark.xfail(LooseVersion(dask.__version__) < "2.3", reason="dask GH5274") -+@pytest.mark.skipif( -+LooseVersion(dask.__version__) > "2021.06", -+reason="dask/dask#7669: can no longer pass output_dtypes and meta", -+) - @requires_dask - def test_vectorize_dask_dtype_meta(): - # meta dtype takes precedence --- -2.32.0 - -From
[gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
commit: f231076548125ab4780412b9c58514b251b79fcb
Author: Michał Górny gentoo org>
AuthorDate: Sat Jul 3 11:12:50 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Jul 3 16:06:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2310765
dev-python/xarray: Backport pandas & dask compatibility fixes
Signed-off-by: Michał Górny gentoo.org>
.../xarray/files/xarray-0.18.2-backports.patch | 116 +
...array-0.18.2.ebuild => xarray-0.18.2-r1.ebuild} | 4 +
2 files changed, 120 insertions(+)
diff --git a/dev-python/xarray/files/xarray-0.18.2-backports.patch
b/dev-python/xarray/files/xarray-0.18.2-backports.patch
new file mode 100644
index 000..be30702e67f
--- /dev/null
+++ b/dev-python/xarray/files/xarray-0.18.2-backports.patch
@@ -0,0 +1,116 @@
+From ca72d56c213a1c47e54b12ee559f412e60fbf9b1 Mon Sep 17 00:00:00 2001
+From: Spencer Clark
+Date: Sat, 22 May 2021 20:13:19 -0400
+Subject: [PATCH] Make `kind` argument in `CFTimeIndex._maybe_cast_slice_bound`
+ optional (#5359)
+
+* [test-upstream] Make kind argument in CFTimeIndex._maybe_cast_slice_bound
optional
+
+* Update doc/whats-new.rst
+
+Co-authored-by: keewis
+
+Co-authored-by: keewis
+---
+ doc/whats-new.rst| 4
+ xarray/coding/cftimeindex.py | 9 +++--
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/xarray/coding/cftimeindex.py b/xarray/coding/cftimeindex.py
+index f0de5565..783fe8d0 100644
+--- a/xarray/coding/cftimeindex.py
b/xarray/coding/cftimeindex.py
+@@ -465,9 +465,14 @@ class CFTimeIndex(pd.Index):
+ else:
+ return pd.Index.get_loc(self, key, method=method,
tolerance=tolerance)
+
+-def _maybe_cast_slice_bound(self, label, side, kind):
++def _maybe_cast_slice_bound(self, label, side, kind=None):
+ """Adapted from
+-pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound"""
++pandas.tseries.index.DatetimeIndex._maybe_cast_slice_bound
++
++Note that we have never used the kind argument in CFTimeIndex and it
is
++deprecated as of pandas version 1.3.0. It exists only for
compatibility
++reasons. We can remove it when our minimum version of pandas is
1.3.0.
++"""
+ if not isinstance(label, str):
+ return label
+
+--
+2.32.0
+
+From 34dc57717c82a86455a9e5abb0a47df782266c7e Mon Sep 17 00:00:00 2001
+From: Mathias Hauser
+Date: Mon, 7 Jun 2021 23:05:24 +0200
+Subject: [PATCH] fix dask meta and output_dtypes error (#5449)
+
+---
+ xarray/tests/test_computation.py | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xarray/tests/test_computation.py
b/xarray/tests/test_computation.py
+index b7ae1ca9..09bed724 100644
+--- a/xarray/tests/test_computation.py
b/xarray/tests/test_computation.py
+@@ -1306,7 +1306,10 @@ def
test_vectorize_dask_dtype_without_output_dtypes(data_array):
+ assert expected.dtype == actual.dtype
+
+
+-@pytest.mark.xfail(LooseVersion(dask.__version__) < "2.3", reason="dask
GH5274")
++@pytest.mark.skipif(
++LooseVersion(dask.__version__) > "2021.06",
++reason="dask/dask#7669: can no longer pass output_dtypes and meta",
++)
+ @requires_dask
+ def test_vectorize_dask_dtype_meta():
+ # meta dtype takes precedence
+--
+2.32.0
+
+From 5a14d7d398be7e0efc6d5c8920dc8886212c3b2a Mon Sep 17 00:00:00 2001
+From: Spencer Clark
+Date: Sat, 12 Jun 2021 08:58:42 -0400
+Subject: [PATCH] Explicitly state datetime units in array constructors in
+ `test_datetime_mean` (#5463)
+
+---
+ xarray/tests/test_duck_array_ops.py | 10 --
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/xarray/tests/test_duck_array_ops.py
b/xarray/tests/test_duck_array_ops.py
+index 0eb00725..6d49e209 100644
+--- a/xarray/tests/test_duck_array_ops.py
b/xarray/tests/test_duck_array_ops.py
+@@ -285,15 +285,15 @@ def assert_dask_array(da, dask):
+ def test_datetime_mean(dask):
+ # Note: only testing numpy, as dask is broken upstream
+ da = DataArray(
+-np.array(["2010-01-01", "NaT", "2010-01-03", "NaT", "NaT"],
dtype="M8"),
++np.array(["2010-01-01", "NaT", "2010-01-03", "NaT", "NaT"],
dtype="M8[ns]"),
+ dims=["time"],
+ )
+ if dask:
+ # Trigger use case where a chunk is full of NaT
+ da = da.chunk({"time": 3})
+
+-expect = DataArray(np.array("2010-01-02", dtype="M8"))
+-expect_nat = DataArray(np.array("NaT", dtype="M8"))
++expect = DataArray(np.array("2010-01-02", dtype="M8[ns]"))
++expect_nat = DataArray(np.array("NaT", dtype="M8[ns]"))
+
+ actual = da.mean()
+ if dask:
+@@ -889,8 +889,6 @@ def test_push_dask():
+ # some chunks of size-1 with NaN
+ with raise_if_dask_computes():
+ actual = push(
+-dask.array.from_array(array, chunks=(1, 2, 3, 2, 2, 1, 1)),
+-axis=0,
+-n=None,
++dask.array.from_array(array,
[gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
commit: 26f8bc923740510269605f2832cd056f1e75345d
Author: Michał Górny gentoo org>
AuthorDate: Mon Dec 14 08:00:51 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Dec 14 08:06:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f8bc92
dev-python/xarray: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/xarray/Manifest | 2 --
.../files/xarray-0.10.8-skip-broken-test.patch | 12 ---
dev-python/xarray/xarray-0.12.1.ebuild | 37 -
dev-python/xarray/xarray-0.16.0.ebuild | 38 --
4 files changed, 89 deletions(-)
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 9d4b9a60cde..53282ff9682 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,4 +1,2 @@
-DIST xarray-0.12.1.tar.gz 1745116 BLAKE2B
f38380503347a17cfe11e930b5e275912fb4fb3f02de057e61b21ad1515c8f5e2d5c28007ebb20cecda0f4398b7c71ce239fb3d6f25a79600f5da509f0976359
SHA512
f9e8033b9387ec4175c9d65199aff9cdfc442abb9d2736fb47ab6170ab1e1860b4eb693317a64dad560ab6974f08f7c13f24ecf24c087154ae2d71203e584426
-DIST xarray-0.16.0.tar.gz 1987841 BLAKE2B
9e191d0c8416b3cbeac484b4bdb12a702314bd6bb982c958f346152ce31832f901c257c59adeca6d32f513de62245648610fd21f4d2ba0e9d6360239c2c4134a
SHA512
25a4c967d316eac97389ac4f7e43483655ba93bec0af0f338416f8cd9493dc22b6709c7c66640dc5021f70438d2e26c8f419bda178bb6f27f951b8515b2610fc
DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B
426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6
SHA512
b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321
DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B
3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772
SHA512
f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
diff --git a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
b/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
deleted file mode 100644
index 62798cbcb5b..000
--- a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
-index 290c7a6e..d49a048e 100644
a/xarray/tests/test_variable.py
-+++ b/xarray/tests/test_variable.py
-@@ -373,6 +373,7 @@ class VariableSubclassTestCases(object):
- assert v[0].values == np.asarray(data)[0]
- assert np.asarray(v[0]) == np.asarray(data)[0]
-
-+@pytest.mark.skip("Fails on Gentoo")
- def test_equals_all_dtypes(self):
- for v, _ in self.example_1d_objects():
- v2 = v.copy()
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild
b/dev-python/xarray/xarray-0.12.1.ebuild
deleted file mode 100644
index 5339b36685a..000
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/;
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/numpy-1.14[${PYTHON_USEDEP}]
- >=dev-python/pandas-0.19.2[${PYTHON_USEDEP}]"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- >=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
-)
-
-python_test() {
- pytest -v || die
-}
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild
b/dev-python/xarray/xarray-0.16.0.ebuild
deleted file mode 100644
index f2df870cfa9..000
--- a/dev-python/xarray/xarray-0.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# pkg_resources use in code
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/;
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
- >=dev-python/pandas-0.25[${PYTHON_USEDEP}]
- >=dev-python/setuptools-41.2[${PYTHON_USEDEP}]"
-# note: most of test
[gentoo-commits] repo/gentoo:master commit in: dev-python/xarray/files/, dev-python/xarray/
commit: 0cc5959f5c00de999089760d82089212192fcfe3
Author: Virgil Dupras gentoo org>
AuthorDate: Thu Aug 23 19:01:07 2018 +
Commit: Virgil Dupras gentoo org>
CommitDate: Thu Aug 23 19:06:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc5959f
dev-python/xarray: fix tests
Bug: https://bugs.gentoo.org/656876
Package-Manager: Portage-2.3.47, Repoman-2.3.10
dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch | 12
dev-python/xarray/xarray-0.10.8.ebuild | 12 +---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
b/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
new file mode 100644
index 000..62798cbcb5b
--- /dev/null
+++ b/dev-python/xarray/files/xarray-0.10.8-skip-broken-test.patch
@@ -0,0 +1,12 @@
+diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
+index 290c7a6e..d49a048e 100644
+--- a/xarray/tests/test_variable.py
b/xarray/tests/test_variable.py
+@@ -373,6 +373,7 @@ class VariableSubclassTestCases(object):
+ assert v[0].values == np.asarray(data)[0]
+ assert np.asarray(v[0]) == np.asarray(data)[0]
+
++@pytest.mark.skip("Fails on Gentoo")
+ def test_equals_all_dtypes(self):
+ for v, _ in self.example_1d_objects():
+ v2 = v.copy()
diff --git a/dev-python/xarray/xarray-0.10.8.ebuild
b/dev-python/xarray/xarray-0.10.8.ebuild
index f2e42e221e9..280a946fa18 100644
--- a/dev-python/xarray/xarray-0.10.8.ebuild
+++ b/dev-python/xarray/xarray-0.10.8.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
inherit distutils-r1
@@ -17,15 +17,21 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.14[${PYTHON_USEDEP}]
dev-python/pandas[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
+ >=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]'
'python2*')
)"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.8-skip-broken-test.patch"
+)
+
python_test() {
- py.test -v || die
+ pytest -v || die
}
