From b1f93c4598b8a3907367e793e8e44718b46e8924 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sun, 4 Jul 2021 01:40:33 +0000 Subject: Adding metadata --- dev-python/aesara/aesara-2.0.10.ebuild | 2 +- dev-python/packaging/Manifest | 1 + dev-python/packaging/packaging-21.0.ebuild | 33 ++++++ dev-python/pbr/pbr-5.6.0.ebuild | 17 +-- dev-python/sip/Manifest | 2 +- dev-python/sip/sip-6.1.1.ebuild | 31 ------ dev-python/sip/sip-6.2.0_pre2106291255.ebuild | 32 ++++++ .../statsmodels-0.12.2-new-pandas-scipy.patch | 49 +++++++++ .../statsmodels/statsmodels-0.12.2-r1.ebuild | 85 +++++++++++++++ dev-python/statsmodels/statsmodels-0.12.2.ebuild | 84 --------------- dev-python/virtualenv/virtualenv-20.4.7.ebuild | 8 +- .../xarray/files/xarray-0.18.2-backports.patch | 116 +++++++++++++++++++++ dev-python/xarray/xarray-0.18.2-r1.ebuild | 46 ++++++++ dev-python/xarray/xarray-0.18.2.ebuild | 42 -------- 14 files changed, 373 insertions(+), 175 deletions(-) create mode 100644 dev-python/packaging/packaging-21.0.ebuild delete mode 100644 dev-python/sip/sip-6.1.1.ebuild create mode 100644 dev-python/sip/sip-6.2.0_pre2106291255.ebuild create mode 100644 dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild delete mode 100644 dev-python/statsmodels/statsmodels-0.12.2.ebuild create mode 100644 dev-python/xarray/files/xarray-0.18.2-backports.patch create mode 100644 dev-python/xarray/xarray-0.18.2-r1.ebuild delete mode 100644 dev-python/xarray/xarray-0.18.2.ebuild (limited to 'dev-python') diff --git a/dev-python/aesara/aesara-2.0.10.ebuild b/dev-python/aesara/aesara-2.0.10.ebuild index 1f1f83c71a1e..44b6ef97757b 100644 --- a/dev-python/aesara/aesara-2.0.10.ebuild +++ b/dev-python/aesara/aesara-2.0.10.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" RDEPEND=" dev-python/filelock[${PYTHON_USEDEP}] diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest index c4102d3c3e0f..04dcb3436b98 100644 --- a/dev-python/packaging/Manifest +++ b/dev-python/packaging/Manifest @@ -1 +1,2 @@ DIST packaging-20.9.gh.tar.gz 78041 BLAKE2B d87c66aa39cfb832a26a350981722ad40a9193b70ca447030405ee474586cc12e4ae5f4dc7fbc5da6944b717545f3d3f7caac376a3da1ab95aa26429723dc6f6 SHA512 fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b +DIST packaging-21.0.gh.tar.gz 79977 BLAKE2B 4ddfa5069f463abeab09ed92650a174d58622927d24b22eed184506d36d9144520e90cd5ea6570e7c06af3c768eda608decc4befb402942e6d6cd1ba5cb10b42 SHA512 612744ad8d0b834709af5d4e2415679271e4cdc304a2e9297ec741e37e62241a041b678568130cd733828a1bf2e5885d62de706934f4018195566107989a6f6b diff --git a/dev-python/packaging/packaging-21.0.ebuild b/dev-python/packaging/packaging-21.0.ebuild new file mode 100644 index 000000000000..7133105024e3 --- /dev/null +++ b/dev-python/packaging/packaging-21.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="Core utilities for Python packages" +HOMEPAGE=" + https://github.com/pypa/packaging/ + https://pypi.org/project/packaging/" +SRC_URI=" + https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + +SLOT="0" +LICENSE="|| ( Apache-2.0 BSD-2 )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=" + >=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}] +" +DEPEND=" + test? ( + dev-python/pretend[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + epytest --capture=no +} diff --git a/dev-python/pbr/pbr-5.6.0.ebuild b/dev-python/pbr/pbr-5.6.0.ebuild index 71384be3114c..045545e089c5 100644 --- a/dev-python/pbr/pbr-5.6.0.ebuild +++ b/dev-python/pbr/pbr-5.6.0.ebuild @@ -3,10 +3,8 @@ EAPI=7 -DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) PYTHON_REQ_USE="threads(+)" - inherit distutils-r1 DESCRIPTION="Inject some useful and sensible default behaviors into setuptools" @@ -16,8 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 # docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848 @@ -34,11 +30,11 @@ BDEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/virtualenv-20.0.3[${PYTHON_USEDEP}] - >=dev-python/stestr-2.1.0[${PYTHON_USEDEP}] dev-vcs/git ' 'python*') )" -PDEPEND="" + +distutils_enable_tests unittest # This normally actually belongs here. python_prepare_all() { @@ -56,16 +52,11 @@ python_prepare_all() { } python_test() { - if [[ ${EPYTHON} == pypy3 ]]; then + if [[ ${EPYTHON} != python* ]]; then einfo "Testing on ${EPYTHON} is not supported at the moment" return fi distutils_install_for_testing - local -x PATH=${TEST_DIR}/scripts:${PATH} - - rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}" - - stestr init || die "stestr init failed under ${EPYTHON}" - stestr run || die "stestr run failed under ${EPYTHON}" + eunittest -b } diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest index 0262879d910d..78a844bd3e93 100644 --- a/dev-python/sip/Manifest +++ b/dev-python/sip/Manifest @@ -1,3 +1,3 @@ DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001 DIST sip-5.5.0.tar.gz 1108126 BLAKE2B 59f0323b3befd7ebb89461e93e1e7e5707d11b2882bd524a45f3a6ba8d8a3c792aff5580027255812f6a3fa0854febeb418690fa6106efb21aab1610d66ef911 SHA512 0122beab575239cdb3b1430dc53a7f74175e3fbb3e113bcafced122ffbc4bd3d339b64a672ac1319ea14cd540b5877c2bcfeb7f8821fe8a3c8ba3ce9744bf803 -DIST sip-6.1.1.tar.gz 1441692 BLAKE2B 89a350be3e8c87cb76ec4222f0ab753213f324bc4573bee82bc4d014e8984d9d47a6f384793f618d090620a9efa2cfb906070a7d99312a29cac715ec98d97f15 SHA512 94e413c3af4dcac9cbd1eef368f4e88c0b3bfe1ad8b97f4a6ec39af1a448fdf1d79f3c845cf8c9b0ed78b04f2a18d176d750a39d13a47f9122e575d034ed88b4 +DIST sip-6.2.0.dev2106291255.tar.gz 1180173 BLAKE2B e5dc12515a692f5cb0e82828cc8a14879a764056b04e15957c3e4eeca3bcaf21bce95397eacf5480a16f3f9c2037596880efc0e6a84599fe232823438b2bdf02 SHA512 35cfa8a9b641bfe2cb7e2454e514ece0cdddc48b7afaf55e65c34b76eff82a9730d05dc6122e4f08cfc2dfbcbca63e99ea11932f778055f532026b3cb2d92873 diff --git a/dev-python/sip/sip-6.1.1.ebuild b/dev-python/sip/sip-6.1.1.ebuild deleted file mode 100644 index 2890e70f621a..000000000000 --- a/dev-python/sip/sip-6.1.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -DESCRIPTION="Python bindings generator for C/C++ libraries" -HOMEPAGE="https://www.riverbankcomputing.com/software/sip/ https://pypi.org/project/sip/" - -MY_P=${PN}-${PV/_pre/.dev} -if [[ ${PV} == *_pre* ]]; then - SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" -fi -S=${WORKDIR}/${MY_P} - -LICENSE="|| ( GPL-2 GPL-3 SIP )" -SLOT="5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - ! +Date: Wed, 7 Apr 2021 09:52:25 +0100 +Subject: [PATCH] MAINT: Fix descriptive stats with extension dtypes + +Add special path for extension dtypes to remove N/A +--- + statsmodels/stats/descriptivestats.py | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/statsmodels/stats/descriptivestats.py b/statsmodels/stats/descriptivestats.py +index d5ad2f2a5..0fd3eb542 100644 +--- a/statsmodels/stats/descriptivestats.py ++++ b/statsmodels/stats/descriptivestats.py +@@ -441,8 +441,20 @@ class Description: + loc = count > 0 + mode_freq = np.full(mode.shape[0], np.nan) + mode_freq[loc] = mode_counts[loc] / count.loc[loc] ++ # TODO: Workaround for pandas AbstractMethodError in extension ++ # types. Remove when quantile is supported for these ++ _df = df ++ try: ++ from pandas.api.types import is_extension_array_dtype ++ _df = df.copy() ++ for col in df: ++ if is_extension_array_dtype(df[col].dtype): ++ _df[col] = _df[col].astype(object).fillna(np.nan) ++ except ImportError: ++ pass ++ + if df.shape[1] > 0: +- iqr = df.quantile(0.75) - df.quantile(0.25) ++ iqr = _df.quantile(0.75) - _df.quantile(0.25) + else: + iqr = mean + +@@ -493,7 +505,8 @@ class Description: + return results_df + # Pandas before 1.0 cannot handle empty DF + if df.shape[1] > 0: +- perc = df.quantile(self._percentiles / 100).astype(float) ++ # TODO: Remove when extension types support quantile ++ perc = _df.quantile(self._percentiles / 100).astype(float) + else: + perc = pd.DataFrame(index=self._percentiles / 100, dtype=float) + if np.all(np.floor(100 * perc.index) == (100 * perc.index)): +-- +2.32.0 + diff --git a/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild b/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild new file mode 100644 index 000000000000..209f46d0f517 --- /dev/null +++ b/dev-python/statsmodels/statsmodels-0.12.2-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Statistical computations and models for use with SciPy" +HOMEPAGE="https://www.statsmodels.org/stable/index.html" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" +IUSE="examples" + +RDEPEND=" + >=dev-python/numpy-1.15[${PYTHON_USEDEP}] + >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}] + dev-python/patsy[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] +" +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] + >=dev-python/numpy-1.15[${PYTHON_USEDEP}] + >=dev-python/scipy-1.1[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/statsmodels-0.11.1-tests.patch" + "${FILESDIR}/${P}-new-pandas-scipy.patch" +) + +distutils_enable_sphinx docs \ + 'dev-python/ipykernel' \ + 'dev-python/jupyter_client' \ + 'dev-python/matplotlib' \ + 'dev-python/nbconvert' \ + 'dev-python/numpydoc' + +distutils_enable_tests pytest + +python_prepare_all() { + # Prevent un-needed d'loading + export VARTEXFONTS="${T}"/fonts + export MPLCONFIGDIR="${T}" + printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die + + sed -e 's:test_combine:_&:' \ + -i statsmodels/imputation/tests/test_mice.py || die + sed -e 's:test_mixedlm:_&:' \ + -i statsmodels/stats/tests/test_mediation.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local -x MKL_NUM_THREADS=1 + local -x OMP_NUM_THREADS=1 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + pushd "${BUILD_DIR}" >/dev/null || die + "${EPYTHON}" -c " +import statsmodels +statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \ + || die "tests fail with ${EPYTHON}" + popd >/dev/null || die +} + +python_install_all() { + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples + fi + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Plotting functionality" "dev-python/matplotlib" +} diff --git a/dev-python/statsmodels/statsmodels-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2.ebuild deleted file mode 100644 index 61e6b2b1c22f..000000000000 --- a/dev-python/statsmodels/statsmodels-0.12.2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Statistical computations and models for use with SciPy" -HOMEPAGE="https://www.statsmodels.org/stable/index.html" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="examples" - -RDEPEND=" - >=dev-python/numpy-1.15[${PYTHON_USEDEP}] - >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}] - dev-python/patsy[${PYTHON_USEDEP}] - >=dev-python/scipy-1.1[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - >=dev-python/numpy-1.15[${PYTHON_USEDEP}] - >=dev-python/scipy-1.1[${PYTHON_USEDEP}] - test? ( - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/statsmodels-0.11.1-tests.patch" - "${FILESDIR}/${P}-new-pandas-scipy.patch" -) - -distutils_enable_sphinx docs \ - 'dev-python/ipykernel' \ - 'dev-python/jupyter_client' \ - 'dev-python/matplotlib' \ - 'dev-python/nbconvert' \ - 'dev-python/numpydoc' - -distutils_enable_tests pytest - -python_prepare_all() { - # Prevent un-needed d'loading - export VARTEXFONTS="${T}"/fonts - export MPLCONFIGDIR="${T}" - printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die - - # these tests require internet - sed -i -e 's:test_results_on_the:_&:' \ - statsmodels/stats/tests/test_dist_dependant_measures.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local -x MKL_NUM_THREADS=1 - local -x OMP_NUM_THREADS=1 - local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - - pushd "${BUILD_DIR}" >/dev/null || die - "${EPYTHON}" -c " -import statsmodels -statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \ - || die "tests fail with ${EPYTHON}" - popd >/dev/null || die -} - -python_install_all() { - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - dodoc -r examples - fi - distutils-r1_python_install_all -} - -pkg_postinst() { - optfeature "Plotting functionality" "dev-python/matplotlib" -} diff --git a/dev-python/virtualenv/virtualenv-20.4.7.ebuild b/dev-python/virtualenv/virtualenv-20.4.7.ebuild index b0669ab7590e..d28d1002421f 100644 --- a/dev-python/virtualenv/virtualenv-20.4.7.ebuild +++ b/dev-python/virtualenv/virtualenv-20.4.7.ebuild @@ -46,9 +46,11 @@ BDEPEND=" ' 'python3*') )" -distutils_enable_sphinx docs \ - dev-python/sphinx_rtd_theme \ - dev-python/towncrier +# (unpackaged deps) +#distutils_enable_sphinx docs \ +# dev-python/sphinx-argparse \ +# dev-python/sphinx_rtd_theme \ +# dev-python/towncrier distutils_enable_tests pytest src_configure() { 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 000000000000..be30702e67f4 --- /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, 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.18.2-r1.ebuild b/dev-python/xarray/xarray-0.18.2-r1.ebuild new file mode 100644 index 000000000000..24ad471bc9b2 --- /dev/null +++ b/dev-python/xarray/xarray-0.18.2-r1.ebuild @@ -0,0 +1,46 @@ +# 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_{6,7,8,9,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 } +} diff --git a/dev-python/xarray/xarray-0.18.2.ebuild b/dev-python/xarray/xarray-0.18.2.ebuild deleted file mode 100644 index 184406e7ca1d..000000000000 --- a/dev-python/xarray/xarray-0.18.2.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_{6,7,8,9,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 - -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 } -} -- cgit v1.3.1