Skip to content

Commit ab20531

Browse files
committed
Merge branch 'main' into backend-indexing
* main: (24 commits) Bump minimum versions (#9796) Namespace-aware `xarray.ufuncs` (#9776) Add prettier and pygrep hooks to pre-commit hooks (#9644) `rolling.construct`: Add `sliding_window_kwargs` to pipe arguments down to `sliding_window_view` (#9720) Bump codecov/codecov-action from 4.6.0 to 5.0.2 in the actions group (#9793) Buffer types (#9787) Add download stats badges (#9786) Fix open_mfdataset for list of fsspec files (#9785) add 'User-Agent'-header to pooch.retrieve (#9782) Optimize `ffill`, `bfill` with dask when `limit` is specified (#9771) fix cf decoding of grid_mapping (#9765) Allow wrapping `np.ndarray` subclasses (#9760) Optimize polyfit (#9766) Use `map_overlap` for rolling reductions with Dask (#9770) fix html repr indexes section (#9768) Bump pypa/gh-action-pypi-publish from 1.11.0 to 1.12.2 in the actions group (#9763) unpin array-api-strict, as issues are resolved upstream (#9762) rewrite the `min_deps_check` script (#9754) CI runs ruff instead of pep8speaks (#9759) Specify copyright holders in main license file (#9756) ...
2 parents 0f54b64 + 700191b commit ab20531

File tree

124 files changed

+3098
-1592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+3098
-1592
lines changed

.binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- h5py
1717
- hdf5
1818
- iris
19-
- lxml # Optional dep of pydap
19+
- lxml # Optional dep of pydap
2020
- matplotlib
2121
- nc-time-axis
2222
- netcdf4

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ coverage:
1010
flags:
1111
- unittests
1212
paths:
13-
- "!xarray/tests/"
13+
- "!xarray/tests/"
1414
unittests:
1515
target: 90%
1616
flags:

.github/ISSUE_TEMPLATE/bugreport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ body:
3737
Please confirm that the bug report is in an excellent state, so we can understand & fix it quickly & efficiently. For more details, check out:
3838
3939
- [Minimal Complete Verifiable Examples](https://stackoverflow.com/help/mcve)
40-
- [Craft Minimal Bug Reports](http://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports)
40+
- [Craft Minimal Bug Reports](https://matthewrocklin.com/minimal-bug-reports)
4141
4242
options:
4343
- label: Minimal example — the example is as focused as reasonably possible to demonstrate the underlying issue in xarray.

.github/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ newIssueWelcomeComment: >
1414
newPRWelcomeComment: >
1515
Thank you for opening this pull request! It may take us a few days to respond here, so thank you for being patient.
1616
17-
If you have questions, some answers may be found in our [contributing guidelines](http://docs.xarray.dev/en/stable/contributing.html).
17+
If you have questions, some answers may be found in our [contributing guidelines](https://docs.xarray.dev/en/stable/contributing.html).
1818
1919
# Comment to be posted to on pull requests merged by a first time user
2020
firstPRMergeComment: >

.github/dependabot.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
version: 2
22
updates:
3-
- package-ecosystem: 'github-actions'
4-
directory: '/'
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
55
schedule:
66
# Check for updates once a week
7-
interval: 'weekly'
7+
interval: "weekly"
88
groups:
99
actions:
1010
patterns:

.github/workflows/benchmarks-last-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ jobs:
2424
- name: Set up conda environment
2525
uses: mamba-org/setup-micromamba@v2
2626
with:
27-
micromamba-version: '1.5.10-0'
27+
micromamba-version: "1.5.10-0"
2828
environment-file: ${{env.CONDA_ENV_FILE}}
2929
environment-name: xarray-tests
3030
cache-environment: true
3131
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}-benchmark"
3232
create-args: >-
3333
asv
3434
35-
- name: 'Get Previous tag'
35+
- name: "Get Previous tag"
3636
id: previoustag
3737
uses: "WyriHaximus/github-action-get-previous-tag@v1"
3838
# with:

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up conda environment
2828
uses: mamba-org/setup-micromamba@v2
2929
with:
30-
micromamba-version: '1.5.10-0'
30+
micromamba-version: "1.5.10-0"
3131
environment-file: ${{env.CONDA_ENV_FILE}}
3232
environment-name: xarray-tests
3333
cache-environment: true
@@ -38,7 +38,6 @@ jobs:
3838
python-build
3939
mamba<=1.5.10
4040
41-
4241
- name: Run benchmarks
4342
shell: bash -l {0}
4443
id: benchmark

.github/workflows/ci-additional.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
124124
125125
- name: Upload mypy coverage to Codecov
126-
uses: codecov/codecov-action@v4.6.0
126+
uses: codecov/codecov-action@v5.0.2
127127
with:
128128
file: mypy_report/cobertura.xml
129129
flags: mypy
@@ -174,7 +174,7 @@ jobs:
174174
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
175175
176176
- name: Upload mypy coverage to Codecov
177-
uses: codecov/codecov-action@v4.6.0
177+
uses: codecov/codecov-action@v5.0.2
178178
with:
179179
file: mypy_report/cobertura.xml
180180
flags: mypy-min
@@ -230,7 +230,7 @@ jobs:
230230
python -m pyright xarray/
231231
232232
- name: Upload pyright coverage to Codecov
233-
uses: codecov/codecov-action@v4.6.0
233+
uses: codecov/codecov-action@v5.0.2
234234
with:
235235
file: pyright_report/cobertura.xml
236236
flags: pyright
@@ -286,7 +286,7 @@ jobs:
286286
python -m pyright xarray/
287287
288288
- name: Upload pyright coverage to Codecov
289-
uses: codecov/codecov-action@v4.6.0
289+
uses: codecov/codecov-action@v5.0.2
290290
with:
291291
file: pyright_report/cobertura.xml
292292
flags: pyright39
@@ -303,6 +303,9 @@ jobs:
303303
run:
304304
shell: bash -l {0}
305305

306+
env:
307+
COLUMNS: 120
308+
306309
steps:
307310
- uses: actions/checkout@v4
308311
with:
@@ -311,20 +314,20 @@ jobs:
311314
- name: Setup micromamba
312315
uses: mamba-org/setup-micromamba@v2
313316
with:
314-
# run with micromamba 1.5.10 together with conda
315-
# conda.api is not API compatible with libmambapy
316-
micromamba-version: "1.5.10-0"
317317
environment-name: xarray-tests
318318
create-args: >-
319319
python=3.12
320320
pyyaml
321321
python-dateutil
322-
conda
322+
cytoolz
323+
rich
324+
rich-click
325+
py-rattler
323326
324327
- name: All-deps minimum versions policy
325328
run: |
326-
python ci/min_deps_check.py ci/requirements/min-all-deps.yml
329+
python ci/minimum_versions.py ci/requirements/min-all-deps.yml
327330
328331
- name: Bare minimum versions policy
329332
run: |
330-
python ci/min_deps_check.py ci/requirements/bare-minimum.yml
333+
python ci/minimum_versions.py ci/requirements/bare-minimum.yml

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
path: pytest.xml
160160

161161
- name: Upload code coverage to Codecov
162-
uses: codecov/codecov-action@v4.6.0
162+
uses: codecov/codecov-action@v5.0.2
163163
with:
164164
file: ./coverage.xml
165165
flags: unittests

.github/workflows/hypothesis.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
runs-on: "ubuntu-latest"
3838
needs: detect-ci-trigger
3939
if: |
40-
always()
41-
&& (
42-
needs.detect-ci-trigger.outputs.triggered == 'false'
43-
&& ( (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
44-
|| contains( github.event.pull_request.labels.*.name, 'run-slow-hypothesis'))
45-
)
40+
always()
41+
&& (
42+
needs.detect-ci-trigger.outputs.triggered == 'false'
43+
&& ( (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
44+
|| contains( github.event.pull_request.labels.*.name, 'run-slow-hypothesis'))
45+
)
4646
defaults:
4747
run:
4848
shell: bash -l {0}
@@ -92,8 +92,8 @@ jobs:
9292
if: success()
9393
id: status
9494
run: |
95-
python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
96-
--report-log output-${{ matrix.python-version }}-log.jsonl
95+
python -m pytest --hypothesis-show-statistics --run-slow-hypothesis properties/*.py \
96+
--report-log output-${{ matrix.python-version }}-log.jsonl
9797
9898
# explicitly save the cache so it gets updated, also do this even if it fails.
9999
- name: Save cached hypothesis directory

0 commit comments

Comments
 (0)