Skip to content

Commit 7e35116

Browse files
committed
Merge branch 'main' into fix-getattr-extension
* main: dev whats-new (pydata#10294) Add SeasonGrouper, SeasonResampler (pydata#9524) (fix): remove `PandasExtensionArray` from repr (pydata#10291) Do not rely on `np.broadcast_to` to perform trivial dimension insertion (pydata#10277) DOC: Remove reference to absolufy (pydata#10290) Fix for scalar detection (pydata#8821) Add Index.validate_dataarray_coord (pydata#10137) add redirect for contributing guide (pydata#10282) Update pre-commit hooks (pydata#10288) Adding xarray-eopf to ecosystem.rst (pydata#10289) Add public typing.py module (pydata#10215) Rename Twitter to X (pydata#10283) Add `xarray-lmfit` extension for curve fitting to ecosystem documentation (pydata#10262)
2 parents 6d4fded + 0535989 commit 7e35116

33 files changed

+1335
-130
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
- id: text-unicode-replacement-char
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
2727
# Ruff version.
28-
rev: v0.11.4
28+
rev: v0.11.8
2929
hooks:
3030
- id: ruff-format
3131
- id: ruff

CORE_TEAM_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ resources such as:
272272
- [`pre-commit`](https://pre-commit.com) hooks for autoformatting.
273273
- [`ruff`](https://github.com/astral-sh/ruff) autoformatting and linting.
274274
- [python-xarray](https://stackoverflow.com/questions/tagged/python-xarray) on Stack Overflow.
275-
- [@xarray_dev](https://twitter.com/xarray_dev) on Twitter.
275+
- [@xarray_dev](https://x.com/xarray_dev) on X.
276276
- [xarray-dev](https://discord.gg/bsSGdwBn) discord community (normally only used for remote synchronous chat during sprints).
277277

278278
You are not required to monitor any of the social resources.

HOW_TO_RELEASE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ upstream https://github.com/pydata/xarray (push)
114114
- SHA256 hash (Click "Show Hashes" next to the link to the wheel)
115115
- Open a pull request to pyodide
116116
117-
14. Issue the release announcement to mailing lists & Twitter. For bug fix releases, I
117+
14. Issue the release announcement to mailing lists & Twitter (X). For bug fix releases, I
118118
usually only email xarray@googlegroups.com. For major/feature releases, I will email a broader
119119
list (no more than once every 3-6 months):
120120

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[![Conda - Downloads](https://img.shields.io/conda/dn/anaconda/xarray?label=conda%7Cdownloads)](https://anaconda.org/anaconda/xarray)
1212
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11183201.svg)](https://doi.org/10.5281/zenodo.11183201)
1313
[![Examples on binder](https://img.shields.io/badge/launch-binder-579ACA.svg?logo=data:image/png;base64,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)](https://mybinder.org/v2/gh/pydata/xarray/main?urlpath=lab/tree/doc/examples/weather-data.ipynb)
14-
[![Twitter](https://img.shields.io/twitter/follow/xarray_dev?style=social)](https://twitter.com/xarray_dev)
14+
[![Twitter](https://img.shields.io/twitter/follow/xarray_dev?style=social)](https://x.com/xarray_dev)
1515

1616
**xarray** (pronounced "ex-array", formerly known as **xray**) is an open source project and Python
1717
package that makes working with labelled multi-dimensional arrays

design_notes/named_array_design_doc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ We plan to publicize this document on :
167167

168168
- [x] `Xarray dev call`
169169
- [ ] `Scientific Python discourse`
170-
- [ ] `Xarray Github`
171-
- [ ] `Twitter`
170+
- [ ] `Xarray GitHub`
171+
- [ ] `Twitter (X)`
172172
- [ ] `Respond to NamedTensor and Scikit-Learn issues?`
173173
- [ ] `Pangeo Discourse`
174174
- [ ] `Numpy, SciPy email lists?`

doc/api-hidden.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@
520520
Index.stack
521521
Index.unstack
522522
Index.create_variables
523+
Index.should_add_coord_to_array
523524
Index.to_pandas_index
524525
Index.isel
525526
Index.sel

doc/api.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,6 +1329,8 @@ Grouper Objects
13291329
groupers.BinGrouper
13301330
groupers.UniqueGrouper
13311331
groupers.TimeResampler
1332+
groupers.SeasonGrouper
1333+
groupers.SeasonResampler
13321334

13331335

13341336
Rolling objects
@@ -1645,6 +1647,7 @@ Exceptions
16451647
:toctree: generated/
16461648

16471649
AlignmentError
1650+
CoordinateValidationError
16481651
MergeError
16491652
SerializationWarning
16501653

doc/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@
182182
"pd.NaT": "~pandas.NaT",
183183
}
184184

185+
autodoc_type_aliases = napoleon_type_aliases # Keep both in sync
186+
185187
# mermaid config
186188
mermaid_version = "10.9.1"
187189

@@ -311,6 +313,7 @@
311313
"why-xarray.rst": "getting-started-guide/why-xarray.rst",
312314
"installing.rst": "getting-started-guide/installing.rst",
313315
"quick-overview.rst": "getting-started-guide/quick-overview.rst",
316+
"contributing.rst": "contribute/contributing.rst",
314317
}
315318

316319
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
@@ -338,6 +341,7 @@
338341
"sparse": ("https://sparse.pydata.org/en/latest/", None),
339342
"xarray-tutorial": ("https://tutorial.xarray.dev/", None),
340343
"zarr": ("https://zarr.readthedocs.io/en/stable/", None),
344+
"xarray-lmfit": ("https://xarray-lmfit.readthedocs.io/stable", None),
341345
}
342346

343347
# based on numpy doc/source/conf.py

doc/contribute/contributing.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,7 @@ Code Formatting
549549

550550
xarray uses several tools to ensure a consistent code format throughout the project:
551551

552-
- `ruff <https://github.com/astral-sh/ruff>`_ for formatting, code quality checks and standardized order in imports
553-
- `absolufy-imports <https://github.com/MarcoGorelli/absolufy-imports>`_ for absolute instead of relative imports from different files,
552+
- `ruff <https://github.com/astral-sh/ruff>`_ for formatting, code quality checks and standardized order in imports, and
554553
- `mypy <https://mypy-lang.org/>`_ for static type checking on `type hints
555554
<https://docs.python.org/3/library/typing.html>`_.
556555

doc/user-guide/ecosystem.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Geosciences
4444
harmonic wind analysis in Python.
4545
- `wradlib <https://wradlib.org/>`_: An Open Source Library for Weather Radar Data Processing.
4646
- `wrf-python <https://wrf-python.readthedocs.io/>`_: A collection of diagnostic and interpolation routines for use with output of the Weather Research and Forecasting (WRF-ARW) Model.
47+
- `xarray-eopf <https://github.com/EOPF-Sample-Service/xarray-eopf>`_: An xarray backend implementation for opening ESA EOPF data products in Zarr format.
4748
- `xarray-regrid <https://github.com/EXCITED-CO2/xarray-regrid>`_: xarray extension for regridding rectilinear data.
4849
- `xarray-simlab <https://xarray-simlab.readthedocs.io>`_: xarray extension for computer model simulations.
4950
- `xarray-spatial <https://xarray-spatial.org/>`_: Numba-accelerated raster-based spatial processing tools (NDVI, curvature, zonal-statistics, proximity, hillshading, viewshed, etc.)
@@ -89,6 +90,7 @@ Extend xarray capabilities
8990
- `X-regression <https://github.com/kuchaale/X-regression>`_: Multiple linear regression from Statsmodels library coupled with Xarray library.
9091
- `xskillscore <https://github.com/xarray-contrib/xskillscore>`_: Metrics for verifying forecasts.
9192
- `xyzpy <https://xyzpy.readthedocs.io>`_: Easily generate high dimensional data, including parallelization.
93+
- `xarray-lmfit <https://github.com/kmnhan/xarray-lmfit>`_: xarray extension for curve fitting using `lmfit <https://lmfit.github.io/lmfit-py/>`_.
9294

9395
Visualization
9496
~~~~~~~~~~~~~

0 commit comments

Comments
 (0)