Skip to content

Commit 67cc617

Browse files
dcheriandcherian
committed
Merge branch 'main' into dask-docs
* main: (125 commits) http:// → https:// (pydata#9748) Discard useless `!s` conversion in f-string (pydata#9752) Apply ruff/flake8-simplify rule SIM401 (pydata#9749) Use micromamba 1.5.10 where conda is needed (pydata#9737) pin array-api-strict<=2.1 (pydata#9751) Reorganise ruff rules (pydata#9738) use new conda-forge package pydap-server (pydata#9741) Enforce ruff/flake8-pie rules (PIE) (pydata#9740) Enforce ruff/flake8-comprehensions rules (C4) (pydata#9724) Enforce ruff/Perflint rules (PERF) (pydata#9730) Apply ruff rule RUF007 (pydata#9739) chmod -x (pydata#9725) Aplpy ruff rules (RUF) (pydata#9731) Fix typos found by codespell (pydata#9721) support for additional scipy nd interpolants (pydata#9599) Apply ruff/flake8-simplify rules (SIM) (pydata#9727) Apply ruff/flake8-implicit-str-concat rules (ISC) (pydata#9722) Apply ruff/flake8-pie rules (PIE) (pydata#9726) Enforce ruff/pygrep-hooks rules (PGH) (pydata#9729) Move to micromamba 2 (pydata#9732) ...
2 parents a7c03e5 + 591d539 commit 67cc617

File tree

203 files changed

+10790
-6971
lines changed

Some content is hidden

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

203 files changed

+10790
-6971
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github: numfocus
2-
custom: http://numfocus.org/donate-to-xarray
2+
custom: https://numfocus.org/donate-to-xarray

‎.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/workflows/benchmarks-last-release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ jobs:
2222
fetch-depth: 0
2323

2424
- name: Set up conda environment
25-
uses: mamba-org/setup-micromamba@v1
25+
uses: mamba-org/setup-micromamba@v2
2626
with:
27+
micromamba-version: '1.5.10-0'
2728
environment-file: ${{env.CONDA_ENV_FILE}}
2829
environment-name: xarray-tests
2930
cache-environment: true

‎.github/workflows/benchmarks.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ jobs:
2525
fetch-depth: 0
2626

2727
- name: Set up conda environment
28-
uses: mamba-org/setup-micromamba@v1
28+
uses: mamba-org/setup-micromamba@v2
2929
with:
30+
micromamba-version: '1.5.10-0'
3031
environment-file: ${{env.CONDA_ENV_FILE}}
3132
environment-name: xarray-tests
3233
cache-environment: true
@@ -35,7 +36,7 @@ jobs:
3536
create-args: >-
3637
asv
3738
python-build
38-
mamba
39+
mamba<=1.5.10
3940
4041
4142
- name: Run benchmarks

‎.github/workflows/ci-additional.yaml‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ jobs:
5555
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
5656
5757
- name: Setup micromamba
58-
uses: mamba-org/setup-micromamba@v1
58+
uses: mamba-org/setup-micromamba@v2
5959
with:
6060
environment-file: ${{env.CONDA_ENV_FILE}}
6161
environment-name: xarray-tests
6262
create-args: >-
6363
python=${{env.PYTHON_VERSION}}
64-
conda
6564
cache-environment: true
6665
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
6766

@@ -70,8 +69,6 @@ jobs:
7069
python -m pip install --no-deps -e .
7170
- name: Version info
7271
run: |
73-
conda info -a
74-
conda list
7572
python xarray/util/print_versions.py
7673
- name: Run doctests
7774
run: |
@@ -81,8 +78,7 @@ jobs:
8178
#
8279
# If dependencies emit warnings we can't do anything about, add ignores to
8380
# `xarray/tests/__init__.py`.
84-
# [MHS, 01/25/2024] Skip datatree_ documentation remove after #8572
85-
python -m pytest --doctest-modules xarray --ignore xarray/tests --ignore xarray/datatree_ -Werror
81+
python -m pytest --doctest-modules xarray --ignore xarray/tests -Werror
8682
8783
mypy:
8884
name: Mypy
@@ -93,7 +89,7 @@ jobs:
9389
shell: bash -l {0}
9490
env:
9591
CONDA_ENV_FILE: ci/requirements/environment.yml
96-
PYTHON_VERSION: "3.11"
92+
PYTHON_VERSION: "3.12"
9793

9894
steps:
9995
- uses: actions/checkout@v4
@@ -104,33 +100,30 @@ jobs:
104100
run: |
105101
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
106102
- name: Setup micromamba
107-
uses: mamba-org/setup-micromamba@v1
103+
uses: mamba-org/setup-micromamba@v2
108104
with:
109105
environment-file: ${{env.CONDA_ENV_FILE}}
110106
environment-name: xarray-tests
111107
create-args: >-
112108
python=${{env.PYTHON_VERSION}}
113-
conda
114109
cache-environment: true
115110
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
116111
- name: Install xarray
117112
run: |
118113
python -m pip install --no-deps -e .
119114
- name: Version info
120115
run: |
121-
conda info -a
122-
conda list
123116
python xarray/util/print_versions.py
124117
- name: Install mypy
125118
run: |
126-
python -m pip install "mypy" --force-reinstall
119+
python -m pip install "mypy==1.13" --force-reinstall
127120
128121
- name: Run mypy
129122
run: |
130123
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
131124
132125
- name: Upload mypy coverage to Codecov
133-
uses: codecov/codecov-action@v4.5.0
126+
uses: codecov/codecov-action@v4.6.0
134127
with:
135128
file: mypy_report/cobertura.xml
136129
flags: mypy
@@ -158,33 +151,30 @@ jobs:
158151
run: |
159152
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
160153
- name: Setup micromamba
161-
uses: mamba-org/setup-micromamba@v1
154+
uses: mamba-org/setup-micromamba@v2
162155
with:
163156
environment-file: ${{env.CONDA_ENV_FILE}}
164157
environment-name: xarray-tests
165158
create-args: >-
166159
python=${{env.PYTHON_VERSION}}
167-
conda
168160
cache-environment: true
169161
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
170162
- name: Install xarray
171163
run: |
172164
python -m pip install --no-deps -e .
173165
- name: Version info
174166
run: |
175-
conda info -a
176-
conda list
177167
python xarray/util/print_versions.py
178168
- name: Install mypy
179169
run: |
180-
python -m pip install "mypy" --force-reinstall
170+
python -m pip install "mypy==1.13" --force-reinstall
181171
182172
- name: Run mypy
183173
run: |
184174
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
185175
186176
- name: Upload mypy coverage to Codecov
187-
uses: codecov/codecov-action@v4.5.0
177+
uses: codecov/codecov-action@v4.6.0
188178
with:
189179
file: mypy_report/cobertura.xml
190180
flags: mypy-min
@@ -217,22 +207,19 @@ jobs:
217207
run: |
218208
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
219209
- name: Setup micromamba
220-
uses: mamba-org/setup-micromamba@v1
210+
uses: mamba-org/setup-micromamba@v2
221211
with:
222212
environment-file: ${{env.CONDA_ENV_FILE}}
223213
environment-name: xarray-tests
224214
create-args: >-
225215
python=${{env.PYTHON_VERSION}}
226-
conda
227216
cache-environment: true
228217
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
229218
- name: Install xarray
230219
run: |
231220
python -m pip install --no-deps -e .
232221
- name: Version info
233222
run: |
234-
conda info -a
235-
conda list
236223
python xarray/util/print_versions.py
237224
- name: Install pyright
238225
run: |
@@ -243,7 +230,7 @@ jobs:
243230
python -m pyright xarray/
244231
245232
- name: Upload pyright coverage to Codecov
246-
uses: codecov/codecov-action@v4.5.0
233+
uses: codecov/codecov-action@v4.6.0
247234
with:
248235
file: pyright_report/cobertura.xml
249236
flags: pyright
@@ -276,22 +263,19 @@ jobs:
276263
run: |
277264
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
278265
- name: Setup micromamba
279-
uses: mamba-org/setup-micromamba@v1
266+
uses: mamba-org/setup-micromamba@v2
280267
with:
281268
environment-file: ${{env.CONDA_ENV_FILE}}
282269
environment-name: xarray-tests
283270
create-args: >-
284271
python=${{env.PYTHON_VERSION}}
285-
conda
286272
cache-environment: true
287273
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
288274
- name: Install xarray
289275
run: |
290276
python -m pip install --no-deps -e .
291277
- name: Version info
292278
run: |
293-
conda info -a
294-
conda list
295279
python xarray/util/print_versions.py
296280
- name: Install pyright
297281
run: |
@@ -302,7 +286,7 @@ jobs:
302286
python -m pyright xarray/
303287
304288
- name: Upload pyright coverage to Codecov
305-
uses: codecov/codecov-action@v4.5.0
289+
uses: codecov/codecov-action@v4.6.0
306290
with:
307291
file: pyright_report/cobertura.xml
308292
flags: pyright39
@@ -325,14 +309,17 @@ jobs:
325309
fetch-depth: 0 # Fetch all history for all branches and tags.
326310

327311
- name: Setup micromamba
328-
uses: mamba-org/setup-micromamba@v1
312+
uses: mamba-org/setup-micromamba@v2
329313
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"
330317
environment-name: xarray-tests
331318
create-args: >-
332319
python=3.12
333320
pyyaml
334-
conda
335321
python-dateutil
322+
conda
336323
337324
- name: All-deps minimum versions policy
338325
run: |

‎.github/workflows/ci.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ jobs:
5858
python-version: "3.10"
5959
os: ubuntu-latest
6060
# Latest python version:
61+
- env: "all-but-numba"
62+
python-version: "3.12"
63+
os: ubuntu-latest
6164
- env: "all-but-dask"
6265
# Not 3.12 because of pint
6366
python-version: "3.11"
@@ -105,15 +108,14 @@ jobs:
105108
echo "PYTHON_VERSION=${{ matrix.python-version }}" >> $GITHUB_ENV
106109
107110
- name: Setup micromamba
108-
uses: mamba-org/setup-micromamba@v1
111+
uses: mamba-org/setup-micromamba@v2
109112
with:
110113
environment-file: ${{ env.CONDA_ENV_FILE }}
111114
environment-name: xarray-tests
112115
cache-environment: true
113116
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
114117
create-args: >-
115118
python=${{matrix.python-version}}
116-
conda
117119
118120
# We only want to install this on one run, because otherwise we'll have
119121
# duplicate annotations.
@@ -128,8 +130,6 @@ jobs:
128130
129131
- name: Version info
130132
run: |
131-
conda info -a
132-
conda list
133133
python xarray/util/print_versions.py
134134
135135
- name: Import xarray
@@ -159,7 +159,7 @@ jobs:
159159
path: pytest.xml
160160

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

‎.github/workflows/hypothesis.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
6262
6363
- name: Setup micromamba
64-
uses: mamba-org/setup-micromamba@v1
64+
uses: mamba-org/setup-micromamba@v2
6565
with:
6666
environment-file: ci/requirements/environment.yml
6767
environment-name: xarray-tests
@@ -76,8 +76,6 @@ jobs:
7676
python -m pip install --no-deps -e .
7777
- name: Version info
7878
run: |
79-
conda info -a
80-
conda list
8179
python xarray/util/print_versions.py
8280
8381
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache

‎.github/workflows/nightly-wheels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fetch-depth: 0
1414
- uses: actions/setup-python@v5
1515
with:
16-
python-version: "3.11"
16+
python-version: "3.12"
1717

1818
- name: Install dependencies
1919
run: |
@@ -38,7 +38,7 @@ jobs:
3838
fi
3939
4040
- name: Upload wheel
41-
uses: scientific-python/upload-nightly-action@b67d7fcc0396e1128a474d1ab2b48aa94680f9fc # 0.5.0
41+
uses: scientific-python/upload-nightly-action@82396a2ed4269ba06c6b2988bb4fd568ef3c3d6b # 0.6.1
4242
with:
4343
anaconda_nightly_upload_token: ${{ secrets.ANACONDA_NIGHTLY }}
4444
artifacts_path: dist

‎.github/workflows/pypi-release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
path: dist
8989
- name: Publish package to TestPyPI
9090
if: github.event_name == 'push'
91-
uses: pypa/gh-action-pypi-publish@v1.10.1
91+
uses: pypa/gh-action-pypi-publish@v1.11.0
9292
with:
9393
repository_url: https://test.pypi.org/legacy/
9494
verbose: true
@@ -111,6 +111,6 @@ jobs:
111111
name: releases
112112
path: dist
113113
- name: Publish package to PyPI
114-
uses: pypa/gh-action-pypi-publish@v1.10.1
114+
uses: pypa/gh-action-pypi-publish@v1.11.0
115115
with:
116116
verbose: true

0 commit comments

Comments
 (0)