commit: a843c5da160e78c9936fd2b09b7c8e9008e5bb5b Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Aug 26 15:27:11 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Aug 26 15:31:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a843c5da
dev-python/xarray: Remove old Signed-off-by: Michał Górny <mgorny <AT> 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..00000000000 --- 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 <[email protected]> -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 <[email protected]> - -Co-authored-by: keewis <[email protected]> ---- - 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 <[email protected]> -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 - - [email protected](LooseVersion(dask.__version__) < "2.3", reason="dask GH5274") [email protected]( -+ 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 <[email protected]> -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, chunks=(1, 2, 3, 2, 2, 1, 1)), axis=0, n=None - ) - np.testing.assert_equal(actual, expected) --- -2.32.0 - diff --git a/dev-python/xarray/xarray-0.17.0.ebuild b/dev-python/xarray/xarray-0.17.0.ebuild deleted file mode 100644 index 4be25c37cc3..00000000000 --- a/dev-python/xarray/xarray-0.17.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pkg_resources use in code -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..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.17[${PYTHON_USEDEP}] - >=dev-python/pandas-1.0[${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}] - >=dev-python/scipy-1.4[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -python_test() { - local deselect=( - # warning-targeted tests are fragile and not important to end users - xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get - ) - - epytest ${deselect[@]/#/--deselect } -} diff --git a/dev-python/xarray/xarray-0.18.1.ebuild b/dev-python/xarray/xarray-0.18.1.ebuild deleted file mode 100644 index f797bf1c514..00000000000 --- a/dev-python/xarray/xarray-0.18.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pkg_resources use in code -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..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.17[${PYTHON_USEDEP}] - >=dev-python/pandas-1.0[${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}] - >=dev-python/scipy-1.4[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -python_test() { - local deselect=( - # warning-targeted tests are fragile and not important to end users - xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get - ) - - epytest ${deselect[@]/#/--deselect } -} diff --git a/dev-python/xarray/xarray-0.18.2-r1.ebuild b/dev-python/xarray/xarray-0.18.2-r1.ebuild deleted file mode 100644 index 510fc2c1b56..00000000000 --- a/dev-python/xarray/xarray-0.18.2-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# pkg_resources use in code -DISTUTILS_USE_SETUPTOOLS=rdepend -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 ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - >=dev-python/numpy-1.17[${PYTHON_USEDEP}] - >=dev-python/pandas-1.0[${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}] - >=dev-python/scipy-1.4[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-backports.patch -) - -python_test() { - local deselect=( - # warning-targeted tests are fragile and not important to end users - xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get - ) - - epytest ${deselect[@]/#/--deselect } -}
