uxarray 2026.8.1__tar.gz → 2026.9.1__tar.gz

{uxarray-2026.8.1 → uxarray-2026.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uxarray
-Version: 2026.8.1
+Version: 2026.9.1
 Summary: Xarray extension for unstructured climate and global weather data analysis and visualization.
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -213,46 +213,48 @@ Classifier: Intended Audience :: Science/Research
 Classifier: Topic :: Scientific/Engineering
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: antimeridian
-Requires-Dist: cartopy
 Requires-Dist: dask[dataframe]
-Requires-Dist: datashader
-Requires-Dist: geoviews
-Requires-Dist: holoviews
-Requires-Dist: matplotlib<3.11
-Requires-Dist: matplotlib-inline
 Requires-Dist: netcdf4
 Requires-Dist: numba>=0.63
 Requires-Dist: numpy
 Requires-Dist: pandas
-Requires-Dist: pyarrow
-Requires-Dist: requests
 Requires-Dist: scikit-learn
 Requires-Dist: scipy
 Requires-Dist: shapely
-Requires-Dist: spatialpandas
-Requires-Dist: geopandas
 Requires-Dist: xarray
-Requires-Dist: hvplot
-Requires-Dist: healpix
 Requires-Dist: polars
-Requires-Dist: pyproj
+Provides-Extra: all
+Requires-Dist: uxarray[dev,geo,viz]; extra == "all"
 Provides-Extra: complete
-Requires-Dist: uxarray[dev]; extra == "complete"
+Requires-Dist: uxarray[dev,geo,viz]; extra == "complete"
 Provides-Extra: dev
+Requires-Dist: asv; extra == "dev"
+Requires-Dist: pooch; extra == "dev"
 Requires-Dist: pre_commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
-Requires-Dist: asv; extra == "dev"
+Provides-Extra: geo
+Requires-Dist: cartopy; extra == "geo"
+Requires-Dist: geopandas>=1.0; extra == "geo"
+Requires-Dist: healpix; extra == "geo"
+Requires-Dist: pyproj; extra == "geo"
+Requires-Dist: spatialpandas; extra == "geo"
+Provides-Extra: viz
+Requires-Dist: cartopy<0.26; extra == "viz"
+Requires-Dist: datashader; extra == "viz"
+Requires-Dist: matplotlib<3.11; extra == "viz"
+Requires-Dist: geoviews; extra == "viz"
+Requires-Dist: holoviews; extra == "viz"
+Requires-Dist: hvplot; extra == "viz"
 Dynamic: license-file
 
 

{uxarray-2026.8.1 → uxarray-2026.9.1}/pyproject.toml

@@ -5,7 +5,6 @@ classifiers=[
   "Topic :: Scientific/Engineering",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
@@ -18,46 +17,58 @@ description = "Xarray extension for unstructured climate and global weather data
 license = {file = "LICENSE"}
 name = "uxarray"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 # minimal dependencies start
 dependencies = [
   "antimeridian",
-  "cartopy",
   "dask[dataframe]",
-  "datashader",
-  "geoviews",
-  "holoviews",
-  "matplotlib<3.11",  # matplotlib 3.11.0 breaks some plots but <3.11 is fine; see issue #1542.
-  "matplotlib-inline",
   "netcdf4",
   "numba>=0.63",  # 0.63 is the first release supporting Python 3.14 (3.10 <= py < 3.15). See #1561.
   "numpy",
   "pandas",
-  "pyarrow",
-  "requests",
   "scikit-learn",
   "scipy",
   "shapely",
-  "spatialpandas",
-  "geopandas",
   "xarray",
-  "hvplot",
-  "healpix",
   "polars",
-  "pyproj"
 ]
 # minimal dependencies end
 
 [project.optional-dependencies]
-complete = ["uxarray[dev]"]
-dev = ['pre_commit', 'pytest', 'pytest-cov', 'ruff', 'asv']
+all = ["uxarray[dev,geo,viz]"]
+complete = ["uxarray[dev,geo,viz]"]  # alias to "all"
+dev = [
+    'asv',
+    'pooch',
+    'pre_commit',
+    'pytest',
+    'pytest-cov',
+    'ruff',
+]
+geo = [
+    "cartopy",  # in both geo and viz because it is needed by to_geodataframe() and by plotting routines.
+    "geopandas>=1.0",  # 1.0 is the first release requiring pyogrio, the file-IO backend read_file needs. See #1693.
+    "healpix",
+    "pyproj",
+    "spatialpandas",
+]
+viz = [
+    "cartopy<0.26",  # cartopy 0.26.0 breaks some geoviews plots; see issue #1780.
+    # (cartopy pin intentionally here but not in "geo" extras because geoviews is only in "viz".)
+    "datashader",
+    "matplotlib<3.11",  # matplotlib 3.11.0 breaks some plots but <3.11 is fine; see issue #1542.
+    "geoviews",  # no version pin; newer should support any cartopy; see holoviz/geoviews#884.
+    "holoviews",
+    "hvplot",
+]
 
 [project.urls]
 Documentation = "https://uxarray.readthedocs.io/"
 Source = "https://github.com/UXARRAY/uxarray"
 Tracker = "https://github.com/UXARRAY/uxarray/issues"
-
+# please keep [project.urls] immediately after [project.optional-dependencies],
+# or, if rearranging sections, make sure to edit installation.rst accordingly.
 
 [build-system]
 build-backend = "setuptools.build_meta"
@@ -88,3 +99,6 @@ known-first-party = ["uxarray"]
 
 [tool.ruff.format]
 docstring-code-format = true
+
+[tool.pytest.ini_options]
+testpaths = ["test"]  # (intentionally excludes test_optional_deps)

{uxarray-2026.8.1 → uxarray-2026.9.1}/uxarray/constants.py

@@ -21,3 +21,13 @@ ENABLE_FMA = False
 GRID_DIMS = ["n_node", "n_edge", "n_face"]
 
 WGS84_CRS = "EPSG:4326"
+
+
+# Threshold the adaptive ``edge_node`` sort in ``uxarray.grid.utils`` is built around, in two
+# related roles. Above a bucket of ``2 * EDGE_NODE_SORT_THRESHOLD``, an insertion sort is abandoned
+# for a heap sort once it has done ``EDGE_NODE_SORT_THRESHOLD`` shifts per edge, keeping
+# that path linear while leaving ample room for the near-sorted input it is chosen for. At or below
+# that size, the bookkeeping would never pay for itself: a bucket of ``size`` holds at most
+# ``size * (size - 1) / 2`` inversions, too few to exhaust the budget, so the plain insertion
+# sort is used instead.
+EDGE_NODE_SORT_THRESHOLD = 8

{uxarray-2026.8.1 → uxarray-2026.9.1}/uxarray/core/api.py

@@ -2,19 +2,21 @@ from __future__ import annotations
 
 import os
 from pathlib import Path
-from typing import Any, Mapping, Sequence, TypeAlias
+from typing import Any, Hashable, Iterable, Mapping, Sequence, TypeAlias
 from warnings import warn
 
 import numpy as np
+import pandas as pd
 import xarray as xr
 
+from uxarray.core.dataarray import UxDataArray
 from uxarray.core.dataset import UxDataset
 from uxarray.core.utils import (
     _map_dims_to_ugrid,
     _open_dataset_with_fallback,
     match_chunks_to_ugrid,
 )
-from uxarray.errors import GridInvalidError
+from uxarray.errors import GridInvalidError, GridsMismatchError
 from uxarray.grid import Grid
 from uxarray.io._scrip import (
     _detect_multigrid,
@@ -575,25 +577,60 @@ def _get_grid(
     return open_grid(grid_filename_or_obj, use_dual=use_dual, **grid_kwargs)
 
 
-def concat(objs, *args, **kwargs):
-    # Ensure there is at least one object to concat.
-    if not objs:
-        raise ValueError("No objects provided for concatenation.")
+def concat(
+    objs: Iterable[UxDataArray | UxDataset],
+    dim: Hashable | xr.Variable | xr.DataArray | pd.Index,
+    **kwargs: dict[str, Any],
+):
+    """concatenate uxarray objects along a new or existing dimension.
 
-    ref_uxgrid = getattr(objs[0], "uxgrid", None)
-    if ref_uxgrid is None:
-        raise AttributeError("The first object does not have a 'uxgrid' attribute.")
+    Parameters
+    ----------
+    objs : iterable of UxDataArray or UxDataset
+        uxarray objects to concatenate together. Each object is expected to
+        consist of variables and coordinates with matching shapes except for
+        along the concatenated dimension, and to have underlying grids which
+        compare as equal. The first object's uxgrid is attached to the result.
+    dim : Hashable or Variable or DataArray or pandas.Index
+        Name of the dimension to concatenate along. This can either be a new
+        dimension name, in which case it is added along axis=0, or an existing
+        dimension name, in which case the location of the dimension is
+        unchanged. If dimension is provided as a Variable, DataArray or Index, its name
+        is used as the dimension to concatenate along and the values are added
+        as a coordinate.
+    **kwargs : dict, optional
+        All additional kwargs forwarded directly to :func:`xarray.concat`.
 
-    ref_id = id(ref_uxgrid)
+    Returns
+    -------
+    concatenated: type of objs
+        Concatenated uxarray object with the same type as the input objects.
+    """
+    objs = tuple(objs)
+    try:
+        ref_obj = objs[0]
+    except IndexError as err:
+        raise ValueError("concat requires at least one object to concatenate.") from err
+
+    result_type = type(ref_obj)
+    if not (
+        issubclass(result_type, (UxDataArray, UxDataset))
+        and all(isinstance(obj, result_type) for obj in objs)
+    ):
+        _types = {type(obj) for obj in objs}
+        raise TypeError(
+            "concat(objs, ...) expected either all UxDataArray "
+            f"or all UxDataset objs, but got types: {_types}."
+        )
 
-    for i, obj in enumerate(objs):
-        uxgrid = getattr(obj, "uxgrid", None)
-        if uxgrid is None:
-            raise AttributeError(
-                f"Object at index {i} does not have a 'uxgrid' attribute."
+    result_uxgrid = ref_obj.uxgrid
+    for i, obj in enumerate(objs[1:], start=1):
+        if result_uxgrid != obj.uxgrid:
+            raise GridsMismatchError(
+                "concat(objs, ...) expects equivalent grids for all objs, "
+                f"but got objs[{i}].uxgrid != objs[0].uxgrid."
             )
-        if id(uxgrid) != ref_id:
-            raise ValueError(f"Object at index {i} has a different 'uxgrid' attribute.")
 
-    res = xr.concat(objs, *args, **kwargs)
-    return UxDataset(res, uxgrid=uxgrid)
+    xarray_objs = [obj.to_xarray() for obj in objs]
+
+    return result_type(xr.concat(xarray_objs, dim=dim, **kwargs), uxgrid=result_uxgrid)