commit: 9c3380eb29d40235f78bb898b7c8423122812eb9
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 20:23:56 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 20:29:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3380eb
dev-python/xarray: keyword 0.19.0 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../files/xarray-0.19.0-riscv_tests_datetime.patch | 73 ++++++++++++++++++++++
dev-python/xarray/xarray-0.19.0.ebuild | 6 +-
profiles/arch/riscv/package.use.mask | 5 --
3 files changed, 78 insertions(+), 6 deletions(-)
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
new file mode 100644
index 00000000000..1f356e95b56
--- /dev/null
+++ b/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
@@ -0,0 +1,73 @@
+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-0.19.0.ebuild
b/dev-python/xarray/xarray-0.19.0.ebuild
index 32c7a204131..c69ae4eb50f 100644
--- a/dev-python/xarray/xarray-0.19.0.ebuild
+++ b/dev-python/xarray/xarray-0.19.0.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
@@ -30,6 +30,10 @@ BDEPEND="
>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
+)
+
distutils_enable_tests pytest
python_test() {
diff --git a/profiles/arch/riscv/package.use.mask
b/profiles/arch/riscv/package.use.mask
index 46119d65307..4f542ef65e8 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -5,7 +5,6 @@
# virtual/mysql & co. round-up:
# dev-db/mariadb fails tests here, see Bug #807995
# dev-db/mysql and dev-db/percona-server do not support this arch
-# dev-db/mariadb-galera has been absent from the tree since June 2019
# dev-db/mysql-cluster not tested yet, seriously outdated in the tree
dev-python/pymysql test
sci-libs/gdal mysql
@@ -70,10 +69,6 @@ app-admin/sudo sssd
# though.
<sci-libs/hdf5-1.12.1 fortran debug
-# Marek Szuba <[email protected]> (2021-07-19)
-# dependencies not keyworded here yet
-dev-python/pandas doc full-support test
-
# Marek Szuba <[email protected]> (2021-07-14)
# LuaJIT does not support riscv
app-text/texlive-core luajittex
