Skip to content
/ xarray Public
forked from pydata/xarray

Commit 23b0cac

Browse files
dcheriandcherian
committed
Merge branch 'main' into groupby-shuffle
* main: fix html repr indexes section (pydata#9768) Bump pypa/gh-action-pypi-publish from 1.11.0 to 1.12.2 in the actions group (pydata#9763) unpin array-api-strict, as issues are resolved upstream (pydata#9762) rewrite the `min_deps_check` script (pydata#9754) CI runs ruff instead of pep8speaks (pydata#9759) Specify copyright holders in main license file (pydata#9756) Compress PNG files (pydata#9747) Dispatch to Dask if nanquantile is available (pydata#9719) Updates to Dask page in Xarray docs (pydata#9495) 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)
2 parents d1a3fc1 + 568dd6f commit 23b0cac

Some content is hidden

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

60 files changed

+961
-615
lines changed

‎.github/ISSUE_TEMPLATE/bugreport.yml

+1-1
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

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up conda environment
2525
uses: mamba-org/setup-micromamba@v2
2626
with:
27-
micromamba-version: '2.0.2-2'
27+
micromamba-version: '1.5.10-0'
2828
environment-file: ${{env.CONDA_ENV_FILE}}
2929
environment-name: xarray-tests
3030
cache-environment: true

‎.github/workflows/benchmarks.yml

+2-2
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: '2.0.2-2'
30+
micromamba-version: '1.5.10-0'
3131
environment-file: ${{env.CONDA_ENV_FILE}}
3232
environment-name: xarray-tests
3333
cache-environment: true
@@ -36,7 +36,7 @@ jobs:
3636
create-args: >-
3737
asv
3838
python-build
39-
mamba
39+
mamba<=1.5.10
4040
4141
4242
- name: Run benchmarks

‎.github/workflows/ci-additional.yaml

+10-12
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ concurrency:
1414

1515
env:
1616
FORCE_COLOR: 3
17-
MICROMAMBA_VERSION: "2.0.2-2"
1817

1918
jobs:
2019
detect-ci-trigger:
@@ -58,7 +57,6 @@ jobs:
5857
- name: Setup micromamba
5958
uses: mamba-org/setup-micromamba@v2
6059
with:
61-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
6260
environment-file: ${{env.CONDA_ENV_FILE}}
6361
environment-name: xarray-tests
6462
create-args: >-
@@ -104,7 +102,6 @@ jobs:
104102
- name: Setup micromamba
105103
uses: mamba-org/setup-micromamba@v2
106104
with:
107-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
108105
environment-file: ${{env.CONDA_ENV_FILE}}
109106
environment-name: xarray-tests
110107
create-args: >-
@@ -156,7 +153,6 @@ jobs:
156153
- name: Setup micromamba
157154
uses: mamba-org/setup-micromamba@v2
158155
with:
159-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
160156
environment-file: ${{env.CONDA_ENV_FILE}}
161157
environment-name: xarray-tests
162158
create-args: >-
@@ -213,7 +209,6 @@ jobs:
213209
- name: Setup micromamba
214210
uses: mamba-org/setup-micromamba@v2
215211
with:
216-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
217212
environment-file: ${{env.CONDA_ENV_FILE}}
218213
environment-name: xarray-tests
219214
create-args: >-
@@ -270,7 +265,6 @@ jobs:
270265
- name: Setup micromamba
271266
uses: mamba-org/setup-micromamba@v2
272267
with:
273-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
274268
environment-file: ${{env.CONDA_ENV_FILE}}
275269
environment-name: xarray-tests
276270
create-args: >-
@@ -304,12 +298,14 @@ jobs:
304298
name: Minimum Version Policy
305299
runs-on: "ubuntu-latest"
306300
needs: detect-ci-trigger
307-
# disabled until `conda` is compatible with the new `libmambapy`
308-
if: false && needs.detect-ci-trigger.outputs.triggered == 'false'
301+
if: needs.detect-ci-trigger.outputs.triggered == 'false'
309302
defaults:
310303
run:
311304
shell: bash -l {0}
312305

306+
env:
307+
COLUMNS: 120
308+
313309
steps:
314310
- uses: actions/checkout@v4
315311
with:
@@ -318,18 +314,20 @@ jobs:
318314
- name: Setup micromamba
319315
uses: mamba-org/setup-micromamba@v2
320316
with:
321-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
322317
environment-name: xarray-tests
323318
create-args: >-
324319
python=3.12
325320
pyyaml
326321
python-dateutil
327-
libmambapy
322+
cytoolz
323+
rich
324+
rich-click
325+
py-rattler
328326
329327
- name: All-deps minimum versions policy
330328
run: |
331-
python ci/min_deps_check.py ci/requirements/min-all-deps.yml
329+
python ci/minimum_versions.py ci/requirements/min-all-deps.yml
332330
333331
- name: Bare minimum versions policy
334332
run: |
335-
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

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ concurrency:
1414

1515
env:
1616
FORCE_COLOR: 3
17-
micromamba_version: 2
1817

1918
jobs:
2019
detect-ci-trigger:
@@ -111,7 +110,6 @@ jobs:
111110
- name: Setup micromamba
112111
uses: mamba-org/setup-micromamba@v2
113112
with:
114-
micromamba-version: '2.0.2-2'
115113
environment-file: ${{ env.CONDA_ENV_FILE }}
116114
environment-name: xarray-tests
117115
cache-environment: true

‎.github/workflows/hypothesis.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
- name: Setup micromamba
6464
uses: mamba-org/setup-micromamba@v2
6565
with:
66-
micromamba-version: "2.0.2-2"
6766
environment-file: ci/requirements/environment.yml
6867
environment-name: xarray-tests
6968
create-args: >-

‎.github/workflows/pypi-release.yaml

+2-2
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.11.0
91+
uses: pypa/gh-action-pypi-publish@v1.12.2
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.11.0
114+
uses: pypa/gh-action-pypi-publish@v1.12.2
115115
with:
116116
verbose: true

‎.github/workflows/upstream-dev-ci.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ concurrency:
1717

1818
env:
1919
FORCE_COLOR: 3
20-
MICROMAMBA_VERSION: "2.0.2-2"
2120

2221
jobs:
2322
detect-ci-trigger:
@@ -64,7 +63,6 @@ jobs:
6463
- name: Set up conda environment
6564
uses: mamba-org/setup-micromamba@v2
6665
with:
67-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
6866
environment-file: ci/requirements/environment.yml
6967
environment-name: xarray-tests
7068
create-args: >-
@@ -121,7 +119,6 @@ jobs:
121119
- name: Set up conda environment
122120
uses: mamba-org/setup-micromamba@v2
123121
with:
124-
micromamba-version: ${{env.MICROMAMBA_VERSION}}
125122
environment-file: ci/requirements/environment.yml
126123
environment-name: xarray-tests
127124
create-args: >-

‎.pep8speaks.yml

-6
This file was deleted.

‎CODE_OF_CONDUCT.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
4040

4141
## Attribution
4242

43-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]
4444

45-
[homepage]: http://contributor-covenant.org
46-
[version]: http://contributor-covenant.org/version/1/4/
45+
[homepage]: https://contributor-covenant.org
46+
[version]: https://contributor-covenant.org/version/1/4/

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Xarray's contributor guidelines [can be found in our online documentation](http://docs.xarray.dev/en/stable/contributing.html)
1+
Xarray's contributor guidelines [can be found in our online documentation](https://docs.xarray.dev/en/stable/contributing.html)

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ recommend that a file or class name and description of purpose be included on
176176
the same "printed page" as the copyright notice for easier identification within
177177
third-party archives.
178178

179-
Copyright [yyyy] [name of copyright owner]
179+
Copyright 2014-2024 xarray Developers
180180

181181
Licensed under the Apache License, Version 2.0 (the "License");
182182
you may not use this file except in compliance with the License.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ our efforts.
9494
## History
9595

9696
Xarray is an evolution of an internal tool developed at [The Climate
97-
Corporation](http://climate.com/). It was originally written by Climate
97+
Corporation](https://climate.com/). It was originally written by Climate
9898
Corp researchers Stephan Hoyer, Alex Kleeman and Eugene Brevdo and was
9999
released as open source in May 2014. The project was renamed from
100100
"xray" in January 2016. Xarray became a fiscally sponsored project of
@@ -108,7 +108,7 @@ Thanks to our many contributors!
108108

109109
## License
110110

111-
Copyright 2014-2023, xarray Developers
111+
Copyright 2014-2024, xarray Developers
112112

113113
Licensed under the Apache License, Version 2.0 (the "License"); you
114114
may not use this file except in compliance with the License. You may

‎asv_bench/asv.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"project": "xarray",
88

99
// The project's homepage
10-
"project_url": "http://docs.xarray.dev/",
10+
"project_url": "https://docs.xarray.dev/",
1111

1212
// The URL or local path of the source code repository for the
1313
// project being benchmarked

0 commit comments

Comments
 (0)