Accepting request 1267447 from devel:languages:python:numeric

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1267447
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-xarray?expand=0&rev=53

local_dataset.patch

@@ -1,20 +1,19 @@
----
- xarray/tutorial.py |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-Index: xarray-2024.05.0/xarray/tutorial.py
+Index: xarray-2025.03.0/xarray/tutorial.py
 ===================================================================
---- xarray-2024.05.0.orig/xarray/tutorial.py
-+++ xarray-2024.05.0/xarray/tutorial.py
-@@ -158,7 +158,10 @@ def open_dataset(
-         url = f"{base_url}/raw/{version}/{path.name}"
+--- xarray-2025.03.0.orig/xarray/tutorial.py
++++ xarray-2025.03.0/xarray/tutorial.py
+@@ -164,9 +164,11 @@ def open_dataset(
+     downloader = pooch.HTTPDownloader(headers=headers)
  
      # retrieve the file
--    filepath = pooch.retrieve(url=url, known_hash=None, path=cache_dir)
+-    filepath = pooch.retrieve(
+-        url=url, known_hash=None, path=cache_dir, downloader=downloader
+-    )
 +    fname = pathlib.Path(cache_dir, path).expanduser()
 +    if not fname.exists():
 +        fname = None
 +    filepath = pooch.retrieve(url=url, fname=fname, known_hash=None, path=cache_dir)
++
      ds = _open_dataset(filepath, engine=engine, **kws)
      if not cache:
          ds = ds.load()

no-mypy-test-plugin.patch

@@ -0,0 +1,13 @@
+Index: xarray-2025.03.0/pyproject.toml
+===================================================================
+--- xarray-2025.03.0.orig/pyproject.toml
++++ xarray-2025.03.0/pyproject.toml
+@@ -296,8 +296,6 @@ ban-relative-imports = "all"
+ addopts = [
+   "--strict-config",
+   "--strict-markers",
+-  "--mypy-only-local-stub",
+-  "--mypy-pyproject-toml-file=pyproject.toml",
+ ]
+ 
+ # We want to forbid warnings from within xarray in our tests — instead we should

python-xarray.changes

@@ -1,3 +1,348 @@
+-------------------------------------------------------------------
+Sun Mar 30 08:19:37 UTC 2025 - Dirk Müller <dmueller@suse.com>
+
+- update to 2025.03.0:
+  * spelling fix: possibilites -> possibilities
+  * Duck array ops for `all` and `any`
+  * `map_over_datasets`: fix error message for wrong result type
+  * Use resolution-dependent default units for lazy time encoding
+  * DOC: Fix 404 on Cubed's documentation
+  * use mean of min/max years as offset in calculation of
+    datetime64 mean
+  * Fix dataarray drop attrs
+  * Start splitting up `dataset.py`
+  * Upgrade mypy to 1.15
+  * implement map_over_datasets kwargs
+  * run CI on `python=3.13`
+  * Prune data tree for Isomorphic operations
+  * Skip failing array api test.
+  * Pass node path to tokenize in `open_datatree`
+  * Fix false timedelta decoding `SerializationWarning` and
+    improve warning message
+  * Add typos check to pre-commit hooks
+  * Ensure KeyError raised for zarr datasets missing dim names
+  * Improve handling of dtype and NaT when encoding/decoding
+    masked and packaged datetimes and timedeltas
+  * fix and supress some test warnings
+  * Update asv badge url in README.md
+  * Fix broken Zarr test
+  * Pin pandas stubs
+  * Use `to_numpy` in time decoding
+  * explicitly cast the dtype of `where`'s condition parameter to
+    `bool`
+  * Better `uv` compatibility
+  * Change `python_files` in `pyproject.toml` to a list
+  * Don't skip tests when on a `mypy` branch
+  * Fix type issues from pandas stubs
+  * Refactor compatibility modules into xarray.compat package
+  * Fix version in requires_zarr_v3 fixture
+  * Adds open_datatree and load_datatree to the tutorial module
+  * Update flaky pydap test
+- update to 2025.01.2:
+  * This release brings non-nanosecond datetime and timedelta
+    resolution to xarray, sharded reading in zarr, suggestion of
+    correct names when trying to access non-existent data
+    variables and bug fixes!
+  * Remove outdated quantile test.
+  * Relax nanosecond datetime restriction in CF time decoding
+  * fix upstream dev issues
+  * Suggest the correct name when no key matches in the dataset
+  * cast type to PDDatetimeUnitOptions
+  * Update time coding tests to assert exact equality
+  * remove dask-expr from CI runs, fix related tests
+  * Use zarr-fixture to prevent thread leakage errors
+  * fix weighted polyfit for arrays with more than 2 dimensions
+  * Fix test_doc_example on big-endian systems
+  * Remove unnecessary a article
+  * Fix some typing
+  * Use flox for grouped first, last
+  * Add `shards` to `valid_encodings` to enable sharded Zarr
+    writing
+  * Add shxarray to the xarray ecosystem list
+  * Remove repetitive that (replace it with the)
+  * Enable `DataTree.to_zarr(compute=False)`
+  * Add `time_unit` argument to `CFTimeIndex.to_datetimeindex`
+  * fix mean for datetime-like using the respective time
+    resolution unit
+  * Enable passing a `CFTimedeltaCoder` to `decode_timedelta`
+  * Revert "Use flox for grouped first, last (#9986)"
+  * Fix infer_freq, check for subdtype "datetime64"/"timedelta64"
+  * Migrate Zarr region="auto" tests to a class
+  * Fix the push method when the limit parameter is bigger than
+    the chunk…
+  * Use `freq="D"` instead of `freq="d"` in `pd.timedelta_range`
+  * cast `numpy` scalars to arrays in `NamedArray.from_array`
+  * remove outdated type-ignores
+  * Preserve order of variables in combine_by_coords
+  * Add FAQ answer about API stability & backwards compatibility
+  * release notes: 2025.01.2
+- update to 2025.01.1:
+  * split out CFDatetimeCoder, deprecate use_cftime as kwarg
+  * Fix zarr upstream tests
+- update to 2025.01.0:
+  * Add blank What's New
+  * Upgrade ruff to 0.8.0
+  * Improved duck array wrapping
+  * Use compute instead of load in plot
+  * Described default centre argument behaviour in rolling
+    functions
+  * Fix type annotations for `get_axis_num` (GH 9822)
+  * Test type annotations for Variable.get_axis_num
+  * FIX: gracfully handle missing seaborn dependency
+  * move ensure_dtype_not_object from conventions to backends
+  * Fixed function links in dataarray.py and dataset.py
+  * Fix seed for random test data.
+  * Set `zarr_format` for `zarr.consolidate_metadata`
+  * Reference ncdata in docs.
+  * Add Pyproject pre-commit hooks
+  * dask tests: Avoid check for non-copies, xfail pandas
+    comparison
+  * Avoid local functions in push
+  * Add token to codecov
+  * Remove deprecated behavior for non-dim positional args
+  * Fix/silence upstream tests
+  * finalize deprecation of "closed"-parameter
+  * Fix upstream Zarr compatibility
+  * Fix interpolation when non-numeric coords are present.
+  * Use integers instead of randint
+  * Add "unit"-parameter to date_range, enhance iso time parser
+    to us
+  * Add missing DataTree attributes to docs
+  * move scalar-handling logic into `possibly_convert_objects`
+  * remove unused "type: ignore" comments in test_plot.py
+  * Optimize idxmin, idxmax with dask
+  * Cache pre-existing Zarr arrays in Zarr backend
+  * Explicitly configure ReadTheDocs build to use conf.py
+  * Skip dask rolling
+  * Rewrite interp to use `apply_ufunc`
+  * friendlier error messages for missing chunk managers
+  * Edit serialization error message
+  * Enhance and move ISO-8601 parser to coding.times
+  * fix warning from scipy backend guess_can_open on directory
+  * time coding refactor
+- add no-mypy-test-plugin.patch: skip pytest-mypy dependency
+
+-------------------------------------------------------------------
+Fri Dec  6 12:27:55 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Skip another type induced test error on 32-bit
+
+-------------------------------------------------------------------
+Sun Nov 24 13:23:43 UTC 2024 - Sebastian Wagner <sebix@sebix.at>
+
+- skip test test_asi8 on 32bit, results in "OverflowError: Python int too large to convert to C long"
+- delete obsolete patches xarray-pr9356-dasktests.patch, xarray-pr9321-dasktests.patch and xarray-pr9403-np2.1-scalar.patch
+- update to version .2024.11.0:
+ - This release brings better support for wrapping JAX arrays and Astropy Quantity objects, :py:meth:`DataTree.persist`, algorithmic improvements:
+ - to many methods with dask (:py:meth:`Dataset.polyfit`, :py:meth:`Dataset.ffill`, :py:meth:`Dataset.bfill`, rolling reductions), and bug fixes.:
+ - Thanks to the 22 contributors to this release:
+ - Benoit Bovy, Deepak Cherian, Dimitri Papadopoulos Orfanos, Holly Mandel, James Bourbeau, Joe Hamman, Justus Magin, Kai Mühlbauer, Lukas Trippe, Mathias Hauser, Maximilian Roos, Michael Niklas, Pascal Bourgault, Patrick Hoefler, Sam Levang, Sarah Charlotte Johnson, Scott Huberty, Stephan Hoyer, Tom Nicholas, Virgile Andreani, joseph nowak and tvo:
+ - New Features:
+  - Added :py:meth:`DataTree.persist` method (:issue:`9675`, :pull:`9682`).
+    By `Sam Levang <https://github.com/slevang>`_.
+  - Added ``write_inherited_coords`` option to :py:meth:`DataTree.to_netcdf`
+    and :py:meth:`DataTree.to_zarr` (:pull:`9677`).
+    By `Stephan Hoyer <https://github.com/shoyer>`_.
+  - Support lazy grouping by dask arrays, and allow specifying ordered groups with ``UniqueGrouper(labels=["a", "b", "c"])``
+    (:issue:`2852`, :issue:`757`).
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Add new ``automatic_rechunk`` kwarg to :py:meth:`DataArrayRolling.construct` and
+    :py:meth:`DatasetRolling.construct`. This is only useful on ``dask>=2024.11.0``
+    (:issue:`9550`). By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Optimize ffill, bfill with dask when limit is specified
+    (:pull:`9771`).
+    By `Joseph Nowak <https://github.com/josephnowak>`_, and
+    `Patrick Hoefler <https://github.com/phofl>`_.
+  - Allow wrapping ``np.ndarray`` subclasses, e.g. ``astropy.units.Quantity`` (:issue:`9704`, :pull:`9760`).
+    By `Sam Levang <https://github.com/slevang>`_ and `Tien Vo <https://github.com/tien-vo>`_.
+  - Optimize :py:meth:`DataArray.polyfit` and :py:meth:`Dataset.polyfit` with dask, when used with
+    arrays with more than two dimensions.
+    (:issue:`5629`). By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Support for directly opening remote files as string paths (for example, ``s3://bucket/data.nc``)
+    with ``fsspec`` when using the ``h5netcdf`` engine (:issue:`9723`, :pull:`9797`).
+    By `James Bourbeau <https://github.com/jrbourbeau>`_.
+  - Re-implement the :py:mod:`ufuncs` module, which now dynamically dispatches to the
+    underlying array's backend. Provides better support for certain wrapped array types
+    like ``jax.numpy.ndarray``. (:issue:`7848`, :pull:`9776`).
+    By `Sam Levang <https://github.com/slevang>`_.
+  - Speed up loading of large zarr stores using dask arrays. (:issue:`8902`)
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+ - Breaking Changes:
+  - The minimum versions of some dependencies were changed
+    ===================== =========  =======
+     Package                    Old      New
+    ===================== =========  =======
+      boto3                    1.28     1.29
+      dask-core             2023.9   2023.11
+      distributed           2023.9   2023.11
+      h5netcdf                 1.2      1.3
+      numbagg                0.2.1      0.6
+      typing_extensions       4.7       4.8
+    ===================== =========  =======
+ - Deprecations:
+  - Grouping by a chunked array (e.g. dask or cubed) currently eagerly loads that variable in to
+    memory. This behaviour is deprecated. If eager loading was intended, please load such arrays
+    manually using ``.load()`` or ``.compute()``. Else pass ``eagerly_compute_group=False``, and
+    provide expected group labels using the ``labels`` kwarg to a grouper object such as
+    :py:class:`grouper.UniqueGrouper` or :py:class:`grouper.BinGrouper`.
+ - Bug fixes:
+  - Fix inadvertent deep-copying of child data in DataTree (:issue:`9683`,
+    :pull:`9684`).
+    By `Stephan Hoyer <https://github.com/shoyer>`_.
+  - Avoid including parent groups when writing DataTree subgroups to Zarr or
+    netCDF (:pull:`9682`).
+    By `Stephan Hoyer <https://github.com/shoyer>`_.
+  - Fix regression in the interoperability of :py:meth:`DataArray.polyfit` and :py:meth:`xr.polyval` for date-time coordinates. (:pull:`9691`).
+    By `Pascal Bourgault <https://github.com/aulemahal>`_.
+  - Fix CF decoding of ``grid_mapping`` to allow all possible formats, add tests (:issue:`9761`, :pull:`9765`).
+    By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
+  - Add ``User-Agent`` to request-headers when retrieving tutorial data (:issue:`9774`, :pull:`9782`)
+    By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
+ - Documentation:
+  - Mention attribute peculiarities in docs/docstrings (:issue:`4798`, :pull:`9700`).
+    By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
+ - Internal Changes:
+  - ``persist`` methods now route through the :py:class:`xr.core.parallelcompat.ChunkManagerEntrypoint` (:pull:`9682`).
+    By `Sam Levang <https://github.com/slevang>`_.
+- update to version 2024.10.0:
+ - This release brings official support for ``xarray.DataTree``, and compatibility with zarr-python v3!:
+ - Aside from these two huge features, it also improves support for vectorised interpolation and fixes various bugs.:
+ - Thanks to the 31 contributors to this release:
+ - Alfonso Ladino, DWesl, Deepak Cherian, Eni, Etienne Schalk, Holly Mandel, Ilan Gold, Illviljan, Joe Hamman, Justus Magin, Kai Mühlbauer, Karl Krauth, Mark Harfouche, Martey Dodoo, Matt Savoie, Maximilian Roos, Patrick Hoefler, Peter Hill, Renat Sibgatulin, Ryan Abernathey, Spencer Clark, Stephan Hoyer, Tom Augspurger, Tom Nicholas, Vecko, Virgile Andreani, Yvonne Fröhlich, carschandler, joseph nowak, mgunyho and owenlittlejohns:
+ - New Features:
+  - ``DataTree`` related functionality is now exposed in the main ``xarray`` public
+    API. This includes: ``xarray.DataTree``, ``xarray.open_datatree``, ``xarray.open_groups``,
+    ``xarray.map_over_datasets``, ``xarray.group_subtrees``,
+    ``xarray.register_datatree_accessor`` and ``xarray.testing.assert_isomorphic``.
+    By `Owen Littlejohns <https://github.com/owenlittlejohns>`_,
+    `Eni Awowale <https://github.com/eni-awowale>`_,
+    `Matt Savoie <https://github.com/flamingbear>`_,
+    `Stephan Hoyer <https://github.com/shoyer>`_,
+    `Tom Nicholas <https://github.com/TomNicholas>`_,
+    `Justus Magin <https://github.com/keewis>`_, and
+    `Alfonso Ladino <https://github.com/aladinor>`_.
+  - A migration guide for users of the prototype `xarray-contrib/datatree repository <https://github.com/xarray-contrib/datatree>`_ has been added, and can be found in the ``DATATREE_MIGRATION_GUIDE.md`` file in the repository root.
+    By `Tom Nicholas <https://github.com/TomNicholas>`_.
+  - Support for Zarr-Python 3 (:issue:`95515`, :pull:`9552`).
+    By `Tom Augspurger <https://github.com/TomAugspurger>`_,
+    `Ryan Abernathey <https://github.com/rabernat>`_ and
+    `Joe Hamman <https://github.com/jhamman>`_.
+  - Added zarr backends for :py:func:`open_groups` (:issue:`9430`, :pull:`9469`).
+    By `Eni Awowale <https://github.com/eni-awowale>`_.
+  - Added support for vectorized interpolation using additional interpolators
+    from the ``scipy.interpolate`` module (:issue:`9049`, :pull:`9526`).
+    By `Holly Mandel <https://github.com/hollymandel>`_.
+  - Implement handling of complex numbers (netcdf4/h5netcdf) and enums (h5netcdf) (:issue:`9246`, :issue:`3297`, :pull:`9509`).
+    By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
+  - Fix passing missing arguments to when opening hdf5 and netCDF4 datatrees
+    (:issue:`9427`, :pull:`9428`).
+    By `Alfonso Ladino <https://github.com/aladinor>`_.
+ - Bug fixes:
+  - Make illegal path-like variable names when constructing a DataTree from a Dataset
+    (:issue:`9339`, :pull:`9378`)
+    By `Etienne Schalk <https://github.com/etienneschalk>`_.
+  - Work around `upstream pandas issue
+    <https://github.com/pandas-dev/pandas/issues/56996>`_ to ensure that we can
+    decode times encoded with small integer dtype values (e.g. ``np.int32``) in
+    environments with NumPy 2.0 or greater without needing to fall back to cftime
+    (:pull:`9518`). By `Spencer Clark <https://github.com/spencerkclark>`_.
+  - Fix bug when encoding times with missing values as floats in the case when
+    the non-missing times could in theory be encoded with integers
+    (:issue:`9488`, :pull:`9497`). By `Spencer Clark
+    <https://github.com/spencerkclark>`_.
+  - Fix a few bugs affecting groupby reductions with ``flox``. (:issue:`8090`, :issue:`9398`, :issue:`9648`).
+  - Fix a few bugs affecting groupby reductions with ``flox``. (:issue:`8090`, :issue:`9398`).
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Fix the safe_chunks validation option on the to_zarr method
+    (:issue:`5511`, :pull:`9559`). By `Joseph Nowak
+    <https://github.com/josephnowak>`_.
+  - Fix binning by multiple variables where some bins have no observations. (:issue:`9630`).
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Fix issue where polyfit wouldn't handle non-dimension coordinates. (:issue:`4375`, :pull:`9369`)
+    By `Karl Krauth <https://github.com/Karl-Krauth>`_.
+ - Documentation:
+  - Migrate documentation for ``datatree`` into main ``xarray`` documentation (:pull:`9033`).
+    For information on previous ``datatree`` releases, please see:
+    `datatree's historical release notes <https://xarray-datatree.readthedocs.io/en/latest/>`_.
+    By `Owen Littlejohns <https://github.com/owenlittlejohns>`_, `Matt Savoie <https://github.com/flamingbear>`_, and
+    `Tom Nicholas <https://github.com/TomNicholas>`_.
+ - Internal Changes:
+- update to version 2024.09.0:
+ - This release drops support for Python 3.9, and adds support for grouping by :ref:`multiple arrays <groupby.multiple>`, while providing numerous performance improvements and bug fixes.:
+ - Thanks to the 33 contributors to this release:
+ - Alfonso Ladino, Andrew Scherer, Anurag Nayak, David Hoese, Deepak Cherian, Diogo Teles Sant'Anna, Dom, Elliott Sales de Andrade, Eni, Holly Mandel, Illviljan, Jack Kelly, Julius Busecke, Justus Magin, Kai Mühlbauer, Manish Kumar Gupta, Matt Savoie, Maximilian Roos, Michele Claus, Miguel Jimenez, Niclas Rieger, Pascal Bourgault, Philip Chmielowiec, Spencer Clark, Stephan Hoyer, Tao Xin, Tiago Sanona, TimothyCera-NOAA, Tom Nicholas, Tom White, Virgile Andreani, oliverhiggs and tiago:
+ - New Features:
+  - Add :py:attr:`~core.accessor_dt.DatetimeAccessor.days_in_year` and
+    :py:attr:`~core.accessor_dt.DatetimeAccessor.decimal_year` to the
+    ``DatetimeAccessor`` on ``xr.DataArray``. (:pull:`9105`).
+    By `Pascal Bourgault <https://github.com/aulemahal>`_.
+ - Performance:
+  - Make chunk manager an option in ``set_options`` (:pull:`9362`).
+    By `Tom White <https://github.com/tomwhite>`_.
+  - Support for :ref:`grouping by multiple variables <groupby.multiple>`.
+    This is quite new, so please check your results and report bugs.
+    Binary operations after grouping by multiple arrays are not supported yet.
+    (:issue:`1056`, :issue:`9332`, :issue:`324`, :pull:`9372`).
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Allow data variable specific ``constant_values`` in the dataset ``pad`` function (:pull:`9353`).
+    By `Tiago Sanona <https://github.com/tsanona>`_.
+  - Speed up grouping by avoiding deep-copy of non-dimension coordinates (:issue:`9426`, :pull:`9393`)
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+ - Breaking changes:
+  - Support for ``python 3.9`` has been dropped (:pull:`8937`)
+  - The minimum versions of some dependencies were changed
+    ===================== =========  =======
+     Package                    Old      New
+    ===================== =========  =======
+      boto3                   1.26      1.28
+      cartopy                 0.21      0.22
+      dask-core             2023.4    2023.9
+      distributed           2023.4    2023.9
+      h5netcdf                1.1        1.2
+      iris                    3.4        3.7
+      numba                   0.56      0.57
+      numpy                   1.23      1.24
+      pandas                  2.0        2.1
+      scipy                   1.10      1.11
+      typing_extensions       4.5        4.7
+      zarr                    2.14      2.16
+    ===================== =========  =======
+ - Bug fixes:
+  - Fix bug with rechunking to a frequency when some periods contain no data (:issue:`9360`).
+    By `Deepak Cherian <https://github.com/dcherian>`_.
+  - Fix bug causing ``DataTree.from_dict`` to be sensitive to insertion order (:issue:`9276`, :pull:`9292`).
+    By `Tom Nicholas <https://github.com/TomNicholas>`_.
+  - Fix resampling error with monthly, quarterly, or yearly frequencies with
+    cftime when the time bins straddle the date "0001-01-01". For example, this
+    can happen in certain circumstances when the time coordinate contains the
+    date "0001-01-01". (:issue:`9108`, :pull:`9116`) By `Spencer Clark
+    <https://github.com/spencerkclark>`_ and `Deepak Cherian
+    <https://github.com/dcherian>`_.
+  - Fix issue with passing parameters to ZarrStore.open_store when opening
+    datatree in zarr format (:issue:`9376`, :pull:`9377`).
+    By `Alfonso Ladino <https://github.com/aladinor>`_
+  - Fix deprecation warning that was raised when calling ``np.array`` on an ``xr.DataArray``
+    in NumPy 2.0 (:issue:`9312`, :pull:`9393`)
+    By `Andrew Scherer <https://github.com/andrew-s28>`_.
+  - Fix passing missing arguments to when opening hdf5 and netCDF4 datatrees
+    (:issue:`9427`, :pull:`9428`).
+    By `Alfonso Ladino <https://github.com/aladinor>`_.
+  - Fix support for using ``pandas.DateOffset``, ``pandas.Timedelta``, and
+    ``datetime.timedelta`` objects as ``resample`` frequencies
+    (:issue:`9408`, :pull:`9413`).
+    By `Oliver Higgs <https://github.com/oliverhiggs>`_.
+ - Internal Changes:
+  - Re-enable testing ``pydap`` backend with ``numpy>=2`` (:pull:`9391`).
+    By `Miguel Jimenez <https://github.com/Mikejmnez>`_ .
+
+-------------------------------------------------------------------
+Sun Nov 24 13:08:38 UTC 2024 - Sebastian Wagner <sebix@sebix.at>
+
+- disable the 'parallel' subpackage because dask is unavailable 3.12, which is because numba is unavailable on 3.13
+  https://build.opensuse.org/request/show/1225144
+  https://github.com/numba/numba/issues/9760
+- disabled tests requiring dask
+
 -------------------------------------------------------------------
 Wed Sep  4 09:11:37 UTC 2024 - Ben Greiner <code@bnavigator.de>
 
@@ -1177,7 +1522,7 @@ Sun Aug  7 03:12:48 UTC 2022 - Arun Persaud <arun@gmx.de>
       details. (PR5692). By Benoît Bovy.
 
 -------------------------------------------------------------------
-Fri Mar  4 18:00:26 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Fri Mar  4 18:00:26 UTC 2022 - Sebastian Wagner <sebix@sebix.at>
 
 - - update to version 2022.03.0:
  - This release brings a number of small improvements, as well as a move to `calendar versioning <https://calver.org/>`_ (:issue:`6176`).:
@@ -1217,7 +1562,7 @@ Fri Mar  4 18:00:26 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
     By `Sebastian Weigand <https://github.com/s-weigand>`_ and `Joe Hamman <https://github.com/jhamman>`_.
 
 -------------------------------------------------------------------
-Wed Feb  2 19:56:06 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Wed Feb  2 19:56:06 UTC 2022 - Sebastian Wagner <sebix@sebix.at>
 
 - - update to version 0.21.1:
  - This is a bugfix release to resolve (:issue:`6216`, :pull:`6207`).:
@@ -1226,7 +1571,7 @@ Wed Feb  2 19:56:06 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
     By `Sebastian Weigand <https://github.com/s-weigand>`_ and `Joe Hamman <https://github.com/jhamman>`_.
 
 -------------------------------------------------------------------
-Sat Jan 29 09:23:51 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sat Jan 29 09:23:51 UTC 2022 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.21.0:
  - Many thanks to the 20 contributors to the v0.21.0 release!:
@@ -1283,7 +1628,7 @@ Mon Jan 24 16:28:40 UTC 2022 - Ben Greiner <code@bnavigator.de>
   yet
 
 -------------------------------------------------------------------
-Fri Dec 10 08:01:01 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Fri Dec 10 08:01:01 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.20.2:
  - This is a bugfix release to resolve (:issue:`3391`, :issue:`5715`). It also:
@@ -1318,7 +1663,7 @@ Fri Dec 10 08:01:01 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
     By `Kai Mühlbauer <https://github.com/kmuehlbauer>`_.
 
 -------------------------------------------------------------------
-Mon Nov 15 14:46:40 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Mon Nov 15 14:46:40 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.20.1:
  - This is a bugfix release to fix :issue:`5930`.:
@@ -1329,7 +1674,7 @@ Mon Nov 15 14:46:40 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
   - Significant improvements to  :ref:`api`. By `Deepak Cherian <https://github.com/dcherian>`_.
 
 -------------------------------------------------------------------
-Tue Nov  2 19:44:34 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Tue Nov  2 19:44:34 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.20.0:
  - This release brings improved support for pint arrays, methods for weighted standard deviation, variance,:
@@ -1459,7 +1804,7 @@ Tue Sep 21 10:38:39 UTC 2021 - Ben Greiner <code@bnavigator.de>
 - Tests require dask[diagnostics] extra now (for Jinja2)
 
 -------------------------------------------------------------------
-Tue Jul 27 11:01:52 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Tue Jul 27 11:01:52 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - remove xarray-pr5449-dask-meta.patch, merged upstream.
 - remove test_resample_loffset.patch, merged upstream.
@@ -1578,20 +1923,20 @@ Tue May 25 17:25:46 UTC 2021 - Matej Cepl <mcepl@suse.com>
   test (gh#pydata/xarray#5364).
 
 -------------------------------------------------------------------
-Thu May 20 11:58:50 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Thu May 20 11:58:50 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.18.2:
  - This release reverts a regression in xarray's unstacking of dask-backed arrays.:
 - remove fix_test_resample_loffset.patch, doesn't work
 
 -------------------------------------------------------------------
-Wed May 19 13:53:54 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Wed May 19 13:53:54 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - add fix_test_resample_loffset.patch to fix test fail on i586
   https://github.com/pydata/xarray/issues/5341
 
 -------------------------------------------------------------------
-Wed May 19 07:26:03 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Wed May 19 07:26:03 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.18.1:
  - This release is intended as a small patch release to be compatible with the new:
@@ -1637,7 +1982,7 @@ Wed May 19 07:26:03 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
     By `Tom Nicholas <https://github.com/TomNicholas>`_.
 
 -------------------------------------------------------------------
-Sun May  9 09:46:42 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sun May  9 09:46:42 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.18.0:
  - This release brings a few important performance improvements, a wide range of:
@@ -1842,7 +2187,7 @@ Sun May  9 09:46:42 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
     By `Maximilian Roos <https://github.com/max-sixty>`_.
 
 -------------------------------------------------------------------
-Sat Feb 27 14:38:41 UTC 2021 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sat Feb 27 14:38:41 UTC 2021 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.17.0:
  - This release brings a few important performance improvements, a wide range of:
@@ -2058,7 +2403,7 @@ Mon Feb 15 12:30:53 UTC 2021 - Ben Greiner <code@bnavigator.de>
 - Recommend/Suggest the extras
 
 -------------------------------------------------------------------
-Sun Dec 20 16:09:14 UTC 2020 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sun Dec 20 16:09:14 UTC 2020 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.16.2:
  - This release brings the ability to write to limited regions of ``zarr`` files, open zarr files with :py:func:`open_dataset` and :py:func:`open_mfdataset`, increased support for propagating ``attrs`` using the ``keep_attrs`` flag, as well as numerous bugfixes and documentation improvements.:
@@ -2171,7 +2516,7 @@ Sun Dec 20 16:09:14 UTC 2020 - Sebastian Wagner <sebix+novell.com@sebix.at>
     <https://github.com/mathause>`_.
 
 -------------------------------------------------------------------
-Wed Sep 23 06:23:20 UTC 2020 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Wed Sep 23 06:23:20 UTC 2020 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.16.1:
  - This patch release fixes an incompatability with a recent pandas change, which:
@@ -2412,7 +2757,7 @@ Sat Mar 28 16:43:47 UTC 2020 - Arun Persaud <arun@gmx.de>
   tested instead of skipping the tests.
 
 -------------------------------------------------------------------
-Sat Feb  1 15:02:10 UTC 2020 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sat Feb  1 15:02:10 UTC 2020 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.15.0:
  - This release brings many improvements to xarray's documentation: our examples are now binderized notebooks (`click here <https://mybinder.org/v2/gh/pydata/xarray/master?urlpath=lab/tree/doc/examples/weather-data.ipynb>`_):
@@ -2860,7 +3205,7 @@ Mon Jul 29 21:32:02 UTC 2019 - Todd R <toddrme2178@gmail.com>
 - Disable non-functional dask tests
 
 -------------------------------------------------------------------
-Mon Jul 15 19:31:13 UTC 2019 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Mon Jul 15 19:31:13 UTC 2019 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.12.3:
  - New functions/methods:
@@ -2885,7 +3230,7 @@ Mon Jul 15 19:31:13 UTC 2019 - Sebastian Wagner <sebix+novell.com@sebix.at>
     once (:issue:`2954`).
 
 -------------------------------------------------------------------
-Sun Jun 30 09:29:36 UTC 2019 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sun Jun 30 09:29:36 UTC 2019 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.12.2:
  - New functions/methods:
@@ -3032,7 +3377,7 @@ Tue Apr 23 09:44:22 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 - Just use %pytest macro
 
 -------------------------------------------------------------------
-Sun Apr  7 11:37:34 UTC 2019 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Sun Apr  7 11:37:34 UTC 2019 - Sebastian Wagner <sebix@sebix.at>
 
 - Update to version 0.12.1:
  - Enhancements
@@ -3148,7 +3493,7 @@ Wed Feb 13 18:04:03 UTC 2019 - Todd R <toddrme2178@gmail.com>
     to ``open_mfdataset``
 
 -------------------------------------------------------------------
-Thu Jan  3 17:40:46 UTC 2019 - Sebastian Wagner <sebix+novell.com@sebix.at>
+Thu Jan  3 17:40:46 UTC 2019 - Sebastian Wagner <sebix@sebix.at>
 
 - update to version 0.11.2:
  - Removes inadvertently introduced setup dependency on pytest-runner (:issue:`2641`). Otherwise, this release is exactly equivalent to 0.11.1.
@@ -3353,7 +3698,7 @@ Wed Jul 18 17:32:13 UTC 2018 - arun@gmx.de
       Hamman.
 
 -------------------------------------------------------------------
-Sun Jun 10 20:04:48 UTC 2018 - sebix+novell.com@sebix.at
+Sun Jun 10 20:04:48 UTC 2018 - sebix@sebix.at
 
 - update to version 0.10.7:
  * Enhancements:
@@ -3473,7 +3818,7 @@ Mon May 21 04:03:17 UTC 2018 - arun@gmx.de
       Root.
 
 -------------------------------------------------------------------
-Sat Apr 14 12:41:49 UTC 2018 - sebix+novell.com@sebix.at
+Sat Apr 14 12:41:49 UTC 2018 - sebix@sebix.at
 
 - temporarily deactivated tests because of minor issues with netCDF library
   see https://github.com/pydata/xarray/issues/2050
@@ -3573,7 +3918,7 @@ Sun Mar  4 09:34:18 UTC 2018 - jengelh@inai.de
 - Replace future goals and aims by present capabilities.
 
 -------------------------------------------------------------------
-Thu Mar  1 11:44:58 UTC 2018 - sebix+novell.com@sebix.at
+Thu Mar  1 11:44:58 UTC 2018 - sebix@sebix.at
 
 - update to version 0.10.1:
  * please see upstream changelog at: https://github.com/pydata/xarray/blob/v0.10.1/doc/whats-new.rst

python-xarray.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-xarray
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,25 +25,19 @@
 %define psuffix %{nil}
 %endif
 
-%define ghversion 2024.07.0
-
 %{?sle15_python_module_pythons}
 Name:           python-xarray%{psuffix}
-Version:        2024.7.0
+Version:        2025.03.0
 Release:        0
 Summary:        N-D labeled arrays and datasets in Python
 License:        Apache-2.0
 URL:            https://github.com/pydata/xarray
-Source:         https://github.com/pydata/xarray/archive/refs/tags/v%{ghversion}.tar.gz#/xarray-%{ghversion}-gh.tar.gz
+Source:         https://github.com/pydata/xarray/archive/refs/tags/v%{version}.tar.gz#/xarray-%{version}-gh.tar.gz
 # PATCH-FEATURE-UPSTREAM local_dataset.patch gh#pydata/xarray#5377 mcepl@suse.com
 # fix xr.tutorial.open_dataset to work with the preloaded cache.
 Patch0:         local_dataset.patch
-# PATCH-FIX-UPSTREAM xarray-pr9321-dasktests.patch gh#pydata/xarray#9321
-Patch1:         xarray-pr9321-dasktests.patch
-# PATCH-FIX-UPSTREAM xarray-pr9356-dasktests.patch gh#pydata/xarray#9356
-Patch2:         xarray-pr9356-dasktests.patch
-# PATCH-FIX-UPSTREAM xarray-pr9403-np2.1-scalar.patch gh#pydata/xarray#9403
-Patch3:         xarray-pr9403-np2.1-scalar.patch
+# PATCH-FIX-OPENSUSE: skip dependency on pytest-mypy
+Patch1:         no-mypy-test-plugin.patch
 BuildRequires:  %{python_module base >= 3.9}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools_scm}
@@ -51,9 +45,9 @@ BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-numpy >= 1.23
+Requires:       python-numpy >= 1.24
 Requires:       python-packaging >= 23.1
-Requires:       python-pandas >= 2
+Requires:       python-pandas >= 2.1
 Obsoletes:      python-xray <= 0.7
 BuildArch:      noarch
 %if %{with test}
@@ -76,16 +70,16 @@ The dataset is an in-memory representation of a netCDF file.
 Summary:        The python xarray[accel] extra
 Requires:       python-Bottleneck
 Requires:       python-opt-einsum
-Requires:       python-scipy
+Requires:       python-scipy >= 1.11
 Requires:       python-xarray = %{version}
 # not available yet
 Recommends:     python-flox
-Recommends:     python-numbagg
+Recommends:     python-numbagg >= 0.6
 
 %description accel
 The [accel] extra for xarray, N-D labeled arrays and datasets in Python
 Except flox and numbagg, because they are not packaged yet.
-Use `pip-%{python_bin_suffix} --user install flox numbagg` to install from PyPI, if needed.
+Use `pip --user install flox numbagg` to install from PyPI, if needed.
 
 %package complete
 Summary:        The python xarray[complete] extra
@@ -93,7 +87,7 @@ Requires:       python-xarray = %{version}
 Requires:       python-xarray-accel = %{version}
 Requires:       python-xarray-dev = %{version}
 Requires:       python-xarray-io = %{version}
-Requires:       python-xarray-parallel = %{version}
+#Requires:       python-xarray-parallel = %%{version}
 Requires:       python-xarray-viz = %{version}
 
 %description complete
@@ -115,30 +109,41 @@ Recommends:     python-pre-commit
 
 %description dev
 The [dev] extra for xarray, N-D labeled arrays and datasets in Python
-Except pre-commit, Use `pip-%{python_bin_suffix} --user install pre-commit` to install, if needed.
+Except pre-commit, Use `pip --user install pre-commit` to install, if needed.
 
 %package io
 Summary:        The python xarray[io] extra
 Requires:       python-cftime
 Requires:       python-fsspec
-Requires:       python-h5netcdf
+Requires:       python-h5netcdf >= 1.3
 Requires:       python-netCDF4
 Requires:       python-pooch
-Requires:       python-scipy
+Requires:       python-scipy >= 1.11
 Requires:       python-xarray = %{version}
-Requires:       python-zarr
+Requires:       python-zarr >= 2.16
 
 %description io
 The [io] extra for xarray, N-D labeled arrays and datasets in Python
 
-%package parallel
-Summary:        The python xarray[parallel] extra
-Requires:       python-dask-complete
-Requires:       python-xarray = %{version}
 
-%description parallel
-The [parallel] extra for xarray, N-D labeled arrays and datasets in Python
 
+
+
+
+
+
+
+
+
+
+
+#%%package parallel
+#Summary:        The python xarray[parallel] extra
+#Requires:       python-dask-complete >= 2023.11
+#Requires:       python-xarray = %%{version}
+#
+#%description parallel
+#The [parallel] extra for xarray, N-D labeled arrays and datasets in Python
 %package viz
 Summary:        The python xarray[viz] extra
 Requires:       python-matplotlib
@@ -151,10 +156,10 @@ Recommends:     python-nc-time-axis
 The [viz] extra for xarray, N-D labeled arrays and datasets in Python
 
 Except nc-time-axis, because it's not packaged yet.
-Use `pip-%{python_bin_suffix} --user install nc-time-axis` to install from PyPI, if needed.
+Use `pip --user install nc-time-axis` to install from PyPI, if needed.
 
 %prep
-%autosetup -p1 -n xarray-%{ghversion}
+%autosetup -p1 -n xarray-%{version}
 chmod -x xarray/util/print_versions.py
 
 %build
@@ -179,12 +184,15 @@ if [ $(getconf LONG_BIT) -eq 32 ]; then
   donttest="$donttest or (test_interpolate_chunk_advanced and linear)"
   # tests for 64bit types
   donttest="$donttest or TestZarrDictStore or TestZarrDirectoryStore or TestZarrWriteEmpty"
-  donttest="$donttest or test_repr_multiindex or test_array_repr_dtypes_unix"
+  donttest="$donttest or test_repr_multiindex or test_array_repr_dtypes_unix or test_asi8"
+  donttest="$donttest or (test_datatree and TestRepr and test_doc_example)"
 fi
 # h5py was built without ROS3 support, can't use ros3 driver
 donttest="$donttest or TestH5NetCDFDataRos3Driver"
 # NetCDF4 fails with these unsupported drivers
 donttest="$donttest or (TestNetCDF4 and test_compression_encoding and (szip or zstd or blosc_lz or blosc_zlib))"
+# skip parallelcompat as the 'parallel' subpackage is not built (see changes file)
+donttest="$donttest or test_h5netcdf_storage_options or test_source_encoding_always_present_with_fsspec"
 
 %pytest -n auto -rsEf -k "not ($donttest)" xarray
 %endif
@@ -194,7 +202,7 @@ donttest="$donttest or (TestNetCDF4 and test_compression_encoding and (szip or z
 %doc README.md
 %license LICENSE licenses/
 %{python_sitelib}/xarray
-%{python_sitelib}/xarray-%{version}.dist-info
+%{python_sitelib}/xarray-*.dist-info
 
 %files %{python_files accel}
 %doc README.md
@@ -212,9 +220,9 @@ donttest="$donttest or (TestNetCDF4 and test_compression_encoding and (szip or z
 %doc README.md
 %license LICENSE
 
-%files %{python_files parallel}
-%doc README.md
-%license LICENSE
+#%%files %%{python_files parallel}
+#%doc README.md
+#%%license LICENSE
 
 %files %{python_files viz}
 %doc README.md

xarray-2024.07.0-gh.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3db5160a699a7731fba26b42aef3f175ca3a6adfe5593bebd0b7af90e55d747d
-size 3756547

xarray-2025.03.0-gh.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5e3bb7e087feaa86f98f0a6bccb40e29205f2f9d6a8329741c2c843ab0f624c
+size 3281586

xarray-pr9321-dasktests.patch

@@ -1,118 +0,0 @@
-From 9406c49fb281d9ffbf88bfd46133288bd23649a4 Mon Sep 17 00:00:00 2001
-From: Deepak Cherian <deepak@cherian.net>
-Date: Tue, 6 Aug 2024 22:21:29 -0600
-Subject: [PATCH 1/2] Fix some dask tests
-
----
- xarray/tests/test_dask.py | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/xarray/tests/test_dask.py b/xarray/tests/test_dask.py
-index 20491eca91a..1ef759b3d6a 100644
---- a/xarray/tests/test_dask.py
-+++ b/xarray/tests/test_dask.py
-@@ -640,8 +640,10 @@ def counting_get(*args, **kwargs):
- 
-     def test_duplicate_dims(self):
-         data = np.random.normal(size=(4, 4))
--        arr = DataArray(data, dims=("x", "x"))
--        chunked_array = arr.chunk({"x": 2})
-+        with pytest.warns(UserWarning, match="Duplicate dimension"):
-+            arr = DataArray(data, dims=("x", "x"))
-+        with pytest.warns(UserWarning, match="Duplicate dimension"):
-+            chunked_array = arr.chunk({"x": 2})
-         assert chunked_array.chunks == ((2, 2), (2, 2))
-         assert chunked_array.chunksizes == {"x": (2, 2)}
- 
-@@ -1364,7 +1366,8 @@ def test_map_blocks_ds_transformations(func, map_ds):
- @pytest.mark.parametrize("obj", [make_da(), make_ds()])
- def test_map_blocks_da_ds_with_template(obj):
-     func = lambda x: x.isel(x=[1])
--    template = obj.isel(x=[1, 5, 9])
-+    # a simple .isel(x=[1, 5, 9]) puts all those in a single chunk.
-+    template = xr.concat([obj.isel(x=[i]) for i in [1, 5, 9]], dim="x")
-     with raise_if_dask_computes():
-         actual = xr.map_blocks(func, obj, template=template)
-     assert_identical(actual, template)
-@@ -1395,15 +1398,16 @@ def test_map_blocks_roundtrip_string_index():
- 
- def test_map_blocks_template_convert_object():
-     da = make_da()
-+    ds = da.to_dataset()
-+
-     func = lambda x: x.to_dataset().isel(x=[1])
--    template = da.to_dataset().isel(x=[1, 5, 9])
-+    template = xr.concat([da.to_dataset().isel(x=[i]) for i in [1, 5, 9]], dim="x")
-     with raise_if_dask_computes():
-         actual = xr.map_blocks(func, da, template=template)
-     assert_identical(actual, template)
- 
--    ds = da.to_dataset()
-     func = lambda x: x.to_dataarray().isel(x=[1])
--    template = ds.to_dataarray().isel(x=[1, 5, 9])
-+    template = xr.concat([ds.to_dataarray().isel(x=[i]) for i in [1, 5, 9]], dim="x")
-     with raise_if_dask_computes():
-         actual = xr.map_blocks(func, ds, template=template)
-     assert_identical(actual, template)
-@@ -1429,7 +1433,7 @@ def test_map_blocks_errors_bad_template(obj):
-         xr.map_blocks(
-             lambda a: a.isel(x=[1]).assign_coords(x=[120]),  # assign bad index values
-             obj,
--            template=obj.isel(x=[1, 5, 9]),
-+            template=xr.concat([obj.isel(x=[i]) for i in [1, 5, 9]], dim="x"),
-         ).compute()
- 
- 
-
-From 6fa200e542fe18b99a86a53126c10639192ea5e1 Mon Sep 17 00:00:00 2001
-From: Deepak Cherian <deepak@cherian.net>
-Date: Tue, 6 Aug 2024 22:29:24 -0600
-Subject: [PATCH 2/2] Cleanup
-
----
- xarray/tests/test_variable.py | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
-index 3f3f1756e45..ff6522c00eb 100644
---- a/xarray/tests/test_variable.py
-+++ b/xarray/tests/test_variable.py
-@@ -318,12 +318,11 @@ def test_datetime64_valid_range(self):
-         with pytest.raises(pderror, match=r"Out of bounds nanosecond"):
-             self.cls(["t"], [data])
- 
--    @pytest.mark.xfail(reason="pandas issue 36615")
-     @pytest.mark.filterwarnings("ignore:Converting non-nanosecond")
-     def test_timedelta64_valid_range(self):
-         data = np.timedelta64("200000", "D")
-         pderror = pd.errors.OutOfBoundsTimedelta
--        with pytest.raises(pderror, match=r"Out of bounds nanosecond"):
-+        with pytest.raises(pderror, match=r"Cannot convert"):
-             self.cls(["t"], [data])
- 
-     def test_pandas_data(self):
-@@ -2301,20 +2300,20 @@ def test_chunk(self):
-         assert blocked.chunks == ((3,), (3, 1))
-         assert blocked.data.name != first_dask_name
- 
--    @pytest.mark.xfail
-+    @pytest.mark.skip
-     def test_0d_object_array_with_list(self):
-         super().test_0d_object_array_with_list()
- 
--    @pytest.mark.xfail
-+    @pytest.mark.skip
-     def test_array_interface(self):
-         # dask array does not have `argsort`
-         super().test_array_interface()
- 
--    @pytest.mark.xfail
-+    @pytest.mark.skip
-     def test_copy_index(self):
-         super().test_copy_index()
- 
--    @pytest.mark.xfail
-+    @pytest.mark.skip
-     @pytest.mark.filterwarnings("ignore:elementwise comparison failed.*:FutureWarning")
-     def test_eq_all_dtypes(self):
-         super().test_eq_all_dtypes()

xarray-pr9356-dasktests.patch

@@ -1,98 +0,0 @@
-From 70e3f30d5a636f6d847acb2dd0d12cffeb601d41 Mon Sep 17 00:00:00 2001
-From: Deepak Cherian <deepak@cherian.net>
-Date: Tue, 13 Aug 2024 19:47:10 -0600
-Subject: [PATCH 1/2] xfail np.cross tests
-
-xref #9327
----
- xarray/core/computation.py       |  6 +++---
- xarray/tests/test_computation.py | 12 ++++++++----
- 2 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/xarray/core/computation.py b/xarray/core/computation.py
-index 5d21d0836b9..bb7122e82de 100644
---- a/xarray/core/computation.py
-+++ b/xarray/core/computation.py
-@@ -23,7 +23,7 @@
- from xarray.core.merge import merge_attrs, merge_coordinates_without_align
- from xarray.core.options import OPTIONS, _get_keep_attrs
- from xarray.core.types import Dims, T_DataArray
--from xarray.core.utils import is_dict_like, is_duck_dask_array, is_scalar, parse_dims
-+from xarray.core.utils import is_dict_like, is_scalar, parse_dims
- from xarray.core.variable import Variable
- from xarray.namedarray.parallelcompat import get_chunked_array_type
- from xarray.namedarray.pycompat import is_chunked_array
-@@ -1693,11 +1693,11 @@ def cross(
-             if a.sizes[dim] < b.sizes[dim]:
-                 a = a.pad({dim: (0, 1)}, constant_values=0)
-                 # TODO: Should pad or apply_ufunc handle correct chunking?
--                a = a.chunk({dim: -1}) if is_duck_dask_array(a.data) else a
-+                a = a.chunk({dim: -1}) if is_chunked_array(a.data) else a
-             else:
-                 b = b.pad({dim: (0, 1)}, constant_values=0)
-                 # TODO: Should pad or apply_ufunc handle correct chunking?
--                b = b.chunk({dim: -1}) if is_duck_dask_array(b.data) else b
-+                b = b.chunk({dim: -1}) if is_chunked_array(b.data) else b
-         else:
-             raise ValueError(
-                 f"{dim!r} on {'a' if a.sizes[dim] == 1 else 'b'} is incompatible:"
-diff --git a/xarray/tests/test_computation.py b/xarray/tests/test_computation.py
-index 8b480b02472..e974b8b1ac8 100644
---- a/xarray/tests/test_computation.py
-+++ b/xarray/tests/test_computation.py
-@@ -2547,7 +2547,8 @@ def test_polyfit_polyval_integration(
-             "cartesian",
-             1,
-         ],
--        [  # Test 1 sized arrays with coords:
-+        # Test 1 sized arrays with coords:
-+        pytest.param(
-             xr.DataArray(
-                 np.array([1]),
-                 dims=["cartesian"],
-@@ -2562,8 +2563,10 @@ def test_polyfit_polyval_integration(
-             np.array([4, 5, 6]),
-             "cartesian",
-             -1,
--        ],
--        [  # Test filling in between with coords:
-+            marks=(pytest.mark.xfail(),),
-+        ),
-+        # Test filling in between with coords:
-+        pytest.param(
-             xr.DataArray(
-                 [1, 2],
-                 dims=["cartesian"],
-@@ -2578,7 +2581,8 @@ def test_polyfit_polyval_integration(
-             np.array([4, 5, 6]),
-             "cartesian",
-             -1,
--        ],
-+            marks=(pytest.mark.xfail(),),
-+        ),
-     ],
- )
- def test_cross(a, b, ae, be, dim: str, axis: int, use_dask: bool) -> None:
-
-From deb9e3266ca163575b200960c14c87fc999dcfc6 Mon Sep 17 00:00:00 2001
-From: Deepak Cherian <deepak@cherian.net>
-Date: Tue, 13 Aug 2024 19:49:56 -0600
-Subject: [PATCH 2/2] Force numpy>=2
-
----
- ci/requirements/environment.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml
-index ef02a3e7f23..40ef4a7fc74 100644
---- a/ci/requirements/environment.yml
-+++ b/ci/requirements/environment.yml
-@@ -26,7 +26,7 @@ dependencies:
-   - numba
-   - numbagg
-   - numexpr
--  - numpy
-+  - numpy>=2
-   - opt_einsum
-   - packaging
-   - pandas

xarray-pr9403-np2.1-scalar.patch

@@ -1,44 +0,0 @@
-From 17367f3545a48d8b8a18bf8f7054b19351c255dc Mon Sep 17 00:00:00 2001
-From: Justus Magin <keewis@posteo.de>
-Date: Tue, 27 Aug 2024 15:18:32 +0200
-Subject: [PATCH 1/3] also call `np.asarray` on numpy scalars
-
----
- xarray/core/variable.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xarray-2024.07.0/xarray/core/variable.py
-===================================================================
---- xarray-2024.07.0.orig/xarray/core/variable.py
-+++ xarray-2024.07.0/xarray/core/variable.py
-@@ -309,7 +309,7 @@ def as_compatible_data(
-         else:
-             data = np.asarray(data)
- 
--    if not isinstance(data, np.ndarray) and (
-+    if not isinstance(data, np.ndarray | np.generic) and (
-         hasattr(data, "__array_function__") or hasattr(data, "__array_namespace__")
-     ):
-         return cast("T_DuckArray", data)
-Index: xarray-2024.07.0/xarray/tests/test_variable.py
-===================================================================
---- xarray-2024.07.0.orig/xarray/tests/test_variable.py
-+++ xarray-2024.07.0/xarray/tests/test_variable.py
-@@ -2585,10 +2585,15 @@ class TestAsCompatibleData(Generic[T_Duc
-                 assert source_ndarray(x) is source_ndarray(as_compatible_data(x))
- 
-     def test_converted_types(self):
--        for input_array in [[[0, 1, 2]], pd.DataFrame([[0, 1, 2]])]:
-+        for input_array in [
-+            [[0, 1, 2]],
-+            pd.DataFrame([[0, 1, 2]]),
-+            np.float64(1.4),
-+            np.str_("abc"),
-+        ]:
-             actual = as_compatible_data(input_array)
-             assert_array_equal(np.asarray(input_array), actual)
--            assert np.ndarray == type(actual)
-+            assert np.ndarray is type(actual)
-             assert np.asarray(input_array).dtype == actual.dtype
- 
-     def test_masked_array(self):