4 files changed, 25 insertions, 219 deletions
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index ac7f9119e650..9a2cd56bfd0f 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,4 @@
 DIST xarray-2024.10.0.tar.gz 3788358 BLAKE2B 974e84e4584201a435e6b2eb48e882f09c44b4fd66583fb86aad4002e404bb07480598e27b1ae5b66863b8f69026d62affdf999f0a6d316966e05841cf1f21b9 SHA512 3a17548cdc3d3b6123c81c124a47b1e538b223e8955593064b37dcc23f61b7cbaf62df57d74a0b8f8cd55f21bfd1a8c69622cb328d08e4212cf0c16d464416dd
 DIST xarray-2024.11.0.tar.gz 3247277 BLAKE2B 2011ba6fa587a6fe96792a7d5a8f253dc589aea59af909c14b7c6a6295eda555df3a12d225fea0af503a778551c8a542fa743a5027c27b60c3e2f8cb4f6c3281 SHA512 0f2d22391eb851b82b804ebd9404a9863143a9ca647fa0d52d9c1b421f94187739986e8c1205274840f46329478846802b11304c02c5dad58ae9ffc6062b1cec
-DIST xarray-2024.6.0.tar.gz 3715179 BLAKE2B 42fa46883d27f656dca9b82e1647bd94a62a427582cd52d847131a8e01caf77a597fcc128453fee1f68c38897a9f995dd4c644e9b68b551ee1c28bc0d48e9465 SHA512 b6f24f834d71cca84f6a485858571a17bcb250915d4f84c886c9e16fc240ae3c3e91d573726e8a09f1dbe269abbfae97498868476eef1a90813ddb29c6a6db62
-DIST xarray-2024.7.0.tar.gz 3728663 BLAKE2B c5b14c3d4ea2cec90565a8fb93e49974f52c6f0e55103cd791e746e674d886be85c7df244690513a482b32062e733a670b759b710739303ae79f9a13beea8c01 SHA512 6a094dacdd8f09fb4674c67e03e1df67d0651053088fe39912713842dddb397cf5b5629193df170a4738dc8f75e96ae26582c73fac4679a1439e9d015dfcfcd1
 DIST xarray-2024.9.0.tar.gz 3747432 BLAKE2B 4b2a3be1712194710aa00f4416479d93171ba3bcc49a68edf2bff65a2224c334807d4db9e63a95d6da7f7bd08170771cdad73f2d224837c35ccfcb2c72b881fb SHA512 179e1a6689095a091c49d6fe3b34e72afbfcfbf4d10056a695e4804cee2fc5e6da1ff9b3073ecce790618031286a2f383f00042d38c49e94a672ee6c2214b85b
+DIST xarray-2025.1.0.tar.gz 3256313 BLAKE2B 28d16b4d7ee99252ce684e4e0ed69b6eb06a3f476c0dbdd6b952bae08a68357bcdc3dde427a788ebffa4498856eb1af78fe9a625541bf6616a32a5daa7862468 SHA512 ea70284f3a9b8bc1dc217354683e67101ea03514ace39a3bdd9f96bf58c36ae6846330ef647f72475e25087f272a33114ba88ecdfed5e18a5df8593efa6e19fd
diff --git a/dev-python/xarray/xarray-2024.6.0-r1.ebuild b/dev-python/xarray/xarray-2024.6.0-r1.ebuild
deleted file mode 100644
index 1958c8661829..000000000000
--- a/dev-python/xarray/xarray-2024.6.0-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv ~x86"
-IUSE="big-endian"
-
-RDEPEND="
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		!riscv? ( dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}] )
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO: these fail with filter errors even if netcdf4 is built
-		# with blosc/zstd support
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[zstd]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_lz4hc]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zlib]'
-		'xarray/tests/test_backends.py::TestNetCDF4Data::test_compression_encoding[blosc_zstd]'
-	)
-
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-
-		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
-			EPYTEST_DESELECT+=(
-				xarray/tests/test_calendar_ops.py::test_interp_calendar
-			)
-		fi
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	if [[ ${ABI} != *64* ]]; then
-		EPYTEST_DESELECT+=(
-			# these tests hardcode object sizes for 64-bit arches
-			# https://github.com/pydata/xarray/issues/9127
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
-			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
-			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
-		)
-	fi
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			xarray/tests/test_dataset.py::TestDataset::test_polyfit_warnings
-			# https://github.com/pandas-dev/pandas/issues/56996
-			xarray/tests/test_backends.py::test_use_cftime_false_standard_calendar_in_range
-			# TODO
-			'xarray/tests/test_dtypes.py::test_maybe_promote[q-expected19]'
-			'xarray/tests/test_dtypes.py::test_maybe_promote[Q-expected20]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype0-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype1-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.6.0.ebuild b/dev-python/xarray/xarray-2024.6.0.ebuild
deleted file mode 100644
index d927966a15c3..000000000000
--- a/dev-python/xarray/xarray-2024.6.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9,10,11,12,13} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="
-	https://xarray.pydata.org/
-	https://github.com/pydata/xarray/
-	https://pypi.org/project/xarray/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ~riscv x86"
-IUSE="big-endian"
-
-RDEPEND="
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-"
-# note: most of the test dependencies are optional
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/cftime[${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}] )
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-	if ! has_version ">=dev-python/scipy-1.4[${PYTHON_USEDEP}]" ; then
-		EPYTEST_DESELECT+=(
-			'xarray/tests/test_missing.py::test_interpolate_na_2d[coords1]'
-		)
-
-		if ! has_version "dev-python/scipy[${PYTHON_USEDEP}]" ; then
-			EPYTEST_DESELECT+=(
-				xarray/tests/test_calendar_ops.py::test_interp_calendar
-			)
-		fi
-	fi
-
-	if use big-endian ; then
-		EPYTEST_DESELECT+=(
-			# Appears to be a numpy issue in display? See bug #916460.
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-20-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-09-21T00:12:44.145224808-ns-float64-1e+30-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225216-ns-float64--9.223372036854776e+18-True]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145224193-ns-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:12:43.145225-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1970-01-01T00:00:01.000001-us-int64-None-False]'
-			'xarray/tests/test_coding_times.py::test_roundtrip_datetime64_nanosecond_precision[1677-09-21T00:21:52.901038080-ns-float32-20.0-True]'
-		)
-	fi
-
-	if [[ ${ABI} != *64* ]]; then
-		EPYTEST_DESELECT+=(
-			# these tests hardcode object sizes for 64-bit arches
-			# https://github.com/pydata/xarray/issues/9127
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex
-			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
-			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
-			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
-		)
-	fi
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			xarray/tests/test_dataset.py::TestDataset::test_polyfit_warnings
-			# https://github.com/pandas-dev/pandas/issues/56996
-			xarray/tests/test_backends.py::test_use_cftime_false_standard_calendar_in_range
-			# TODO
-			'xarray/tests/test_dtypes.py::test_maybe_promote[q-expected19]'
-			'xarray/tests/test_dtypes.py::test_maybe_promote[Q-expected20]'
-		)
-	fi
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest
-}
diff --git a/dev-python/xarray/xarray-2024.7.0.ebuild b/dev-python/xarray/xarray-2025.1.0-r1.ebuild
index 0d2e07f87f58..0866f3804b53 100644
--- a/dev-python/xarray/xarray-2024.7.0.ebuild
+++ b/dev-python/xarray/xarray-2025.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,9 +21,9 @@ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="big-endian"
 
 RDEPEND="
-	>=dev-python/numpy-1.23[${PYTHON_USEDEP}]
-	>=dev-python/pandas-2.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.24[${PYTHON_USEDEP}]
+	>=dev-python/pandas-2.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.2[${PYTHON_USEDEP}]
 "
 # note: most of the test dependencies are optional
 BDEPEND="
@@ -33,7 +33,9 @@ BDEPEND="
 		dev-python/cftime[${PYTHON_USEDEP}]
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
-		!riscv? ( dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}] )
+		!riscv? ( !x86? (
+			dev-python/netcdf4[bzip2,szip,${PYTHON_USEDEP}]
+		) )
 		dev-python/toolz[${PYTHON_USEDEP}]
 		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
 	)
@@ -87,19 +89,27 @@ python_test() {
 			xarray/tests/test_dataarray.py::TestDataArray::test_repr_multiindex_long
 			xarray/tests/test_dataset.py::TestDataset::test_repr_multiindex
 			xarray/tests/test_formatting.py::test_array_repr_dtypes_unix
+
+			# converting timestamps into ns, causing an overflow
+			xarray/tests/test_cftimeindex.py::test_asi8
+			xarray/tests/test_coding_times.py::test_decode_cf_time_bounds
+			xarray/tests/test_coding_times.py::test_use_cftime_false_standard_calendar_in_range
+			xarray/tests/test_coding_times.py::test_decode_cf_datetime_non_standard_units
 		)
 	fi
 
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
+	case ${ARCH} in
+		arm64)
+			EPYTEST_DESELECT+=(
+				'xarray/tests/test_backends.py::TestNetCDF4Data::test_roundtrip_mask_and_scale[dtype0-create_unsigned_false_masked_scaled_data-create_encoded_unsigned_false_masked_scaled_data]'
+				'xarray/tests/test_backends.py::TestNetCDF4Data::test_roundtrip_mask_and_scale[dtype1-create_unsigned_false_masked_scaled_data-create_encoded_unsigned_false_masked_scaled_data]'
+			)
+			;;
+	esac
+
+	if ! has_version "dev-python/seaborn[${PYTHON_USEDEP}]"; then
 		EPYTEST_DESELECT+=(
-			xarray/tests/test_dataset.py::TestDataset::test_polyfit_warnings
-			# https://github.com/pandas-dev/pandas/issues/56996
-			xarray/tests/test_backends.py::test_use_cftime_false_standard_calendar_in_range
-			# TODO
-			'xarray/tests/test_dtypes.py::test_maybe_promote[q-expected19]'
-			'xarray/tests/test_dtypes.py::test_maybe_promote[Q-expected20]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype0-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
-			'xarray/tests/test_conventions.py::TestCFEncodedDataStore::test_roundtrip_mask_and_scale[dtype1-create_unsigned_masked_scaled_data-create_encoded_unsigned_masked_scaled_data]'
+			xarray/tests/test_plot.py::TestContour::test_colors
 		)
 	fi