Skip to content
forked from pydata/xarray

Commit 45b6b27

Browse files
committed
Merge branch 'main' into init-zarr
* main: (58 commits) Adapt map_blocks to use new Coordinates API (pydata#8560) add xeofs to ecosystem.rst (pydata#8561) Offer a fixture for unifying DataArray & Dataset tests (pydata#8533) Generalize cumulative reduction (scan) to non-dask types (pydata#8019) Filter null values before plotting (pydata#8535) Update concat.py (pydata#8538) Add getitem to array protocol (pydata#8406) Added option to specify weights in xr.corr() and xr.cov() (pydata#8527) Filter out doctest warning (pydata#8539) Bump actions/setup-python from 4 to 5 (pydata#8540) Point users to where in their code they should make mods for Dataset.dims (pydata#8534) Add Cumulative aggregation (pydata#8512) dev whats-new Whats-new for 2023.12.0 (pydata#8532) explicitly skip using `__array_namespace__` for `numpy.ndarray` (pydata#8526) Add `eval` method to Dataset (pydata#7163) Deprecate ds.dims returning dict (pydata#8500) test and fix empty xindexes repr (pydata#8521) Remove PR labeler bot (pydata#8525) Hypothesis strategy for generating Variable objects (pydata#8404) ...
2 parents c0cf4ee + b444438 commit 45b6b27

File tree

103 files changed

+3831
-2506
lines changed

Some content is hidden

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

103 files changed

+3831
-2506
lines changed

.github/labeler.yml

-85
This file was deleted.

.github/workflows/benchmarks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
benchmark:
10-
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || contains( github.event.pull_request.labels.*.name, 'topic-performance') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
10+
if: ${{ contains( github.event.pull_request.labels.*.name, 'run-benchmark') && github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }}
1111
name: Linux
1212
runs-on: ubuntu-20.04
1313
env:

.github/workflows/ci-additional.yaml

+10-6
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
env:
4343
CONDA_ENV_FILE: ci/requirements/environment.yml
44-
PYTHON_VERSION: "3.10"
44+
PYTHON_VERSION: "3.11"
4545

4646
steps:
4747
- uses: actions/checkout@v4
@@ -76,7 +76,11 @@ jobs:
7676
# Raise an error if there are warnings in the doctests, with `-Werror`.
7777
# This is a trial; if it presents an problem, feel free to remove.
7878
# See https://github.com/pydata/xarray/issues/7164 for more info.
79-
python -m pytest --doctest-modules xarray --ignore xarray/tests -Werror
79+
80+
# ignores:
81+
# 1. h5py: see https://github.com/pydata/xarray/issues/8537
82+
python -m pytest --doctest-modules xarray --ignore xarray/tests -Werror \
83+
-W "ignore:h5py is running against HDF5 1.14.3:UserWarning"
8084
8185
mypy:
8286
name: Mypy
@@ -87,7 +91,7 @@ jobs:
8791
shell: bash -l {0}
8892
env:
8993
CONDA_ENV_FILE: ci/requirements/environment.yml
90-
PYTHON_VERSION: "3.10"
94+
PYTHON_VERSION: "3.11"
9195

9296
steps:
9397
- uses: actions/checkout@v4
@@ -117,7 +121,7 @@ jobs:
117121
python xarray/util/print_versions.py
118122
- name: Install mypy
119123
run: |
120-
python -m pip install "mypy<1.7" --force-reinstall
124+
python -m pip install "mypy<1.8" --force-reinstall
121125
122126
- name: Run mypy
123127
run: |
@@ -171,7 +175,7 @@ jobs:
171175
python xarray/util/print_versions.py
172176
- name: Install mypy
173177
run: |
174-
python -m pip install "mypy<1.7" --force-reinstall
178+
python -m pip install "mypy<1.8" --force-reinstall
175179
176180
- name: Run mypy
177181
run: |
@@ -332,7 +336,7 @@ jobs:
332336
with:
333337
environment-name: xarray-tests
334338
create-args: >-
335-
python=3.10
339+
python=3.11
336340
pyyaml
337341
conda
338342
python-dateutil

.github/workflows/label-all.yml

-14
This file was deleted.

.github/workflows/label-prs.yml

-12
This file was deleted.

.github/workflows/nightly-wheels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
14-
- uses: actions/setup-python@v4
14+
- uses: actions/setup-python@v5
1515
with:
1616
python-version: "3.11"
1717

.github/workflows/pypi-release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
18-
- uses: actions/setup-python@v4
18+
- uses: actions/setup-python@v5
1919
name: Install Python
2020
with:
2121
python-version: "3.11"
@@ -50,7 +50,7 @@ jobs:
5050
needs: build-artifacts
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/setup-python@v4
53+
- uses: actions/setup-python@v5
5454
name: Install Python
5555
with:
5656
python-version: "3.11"
@@ -88,7 +88,7 @@ jobs:
8888
path: dist
8989
- name: Publish package to TestPyPI
9090
if: github.event_name == 'push'
91-
uses: pypa/[email protected].10
91+
uses: pypa/[email protected].11
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/[email protected].10
114+
uses: pypa/[email protected].11
115115
with:
116116
verbose: true

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
fail-fast: false
5252
matrix:
53-
python-version: ["3.10"]
53+
python-version: ["3.11"]
5454
steps:
5555
- uses: actions/checkout@v4
5656
with:
@@ -110,17 +110,17 @@ jobs:
110110
strategy:
111111
fail-fast: false
112112
matrix:
113-
python-version: ["3.10"]
113+
python-version: ["3.11"]
114114
steps:
115115
- uses: actions/checkout@v4
116116
with:
117117
fetch-depth: 0 # Fetch all history for all branches and tags.
118118
- name: Set up conda environment
119-
uses: mamba-org/provision-with-micromamba@v15
119+
uses: mamba-org/setup-micromamba@v1
120120
with:
121121
environment-file: ci/requirements/environment.yml
122122
environment-name: xarray-tests
123-
extra-specs: |
123+
create-args: >-
124124
python=${{ matrix.python-version }}
125125
pytest-reportlog
126126
conda

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ repos:
1818
files: ^xarray/
1919
- repo: https://github.com/astral-sh/ruff-pre-commit
2020
# Ruff version.
21-
rev: 'v0.1.4'
21+
rev: 'v0.1.6'
2222
hooks:
2323
- id: ruff
2424
args: ["--fix"]
2525
# https://github.com/python/black#version-control-integration
2626
- repo: https://github.com/psf/black
27-
rev: 23.10.1
27+
rev: 23.11.0
2828
hooks:
2929
- id: black-jupyter
3030
- repo: https://github.com/keewis/blackdoc
3131
rev: v0.3.9
3232
hooks:
3333
- id: blackdoc
3434
exclude: "generate_aggregations.py"
35-
additional_dependencies: ["black==23.10.1"]
35+
additional_dependencies: ["black==23.11.0"]
3636
- id: blackdoc-autoupdate-black
3737
- repo: https://github.com/pre-commit/mirrors-mypy
38-
rev: v1.6.1
38+
rev: v1.7.1
3939
hooks:
4040
- id: mypy
4141
# Copied from setup.cfg

ci/requirements/doc.yml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies:
99
- cartopy
1010
- cfgrib
1111
- dask-core>=2022.1
12+
- hypothesis>=6.75.8
1213
- h5netcdf>=0.13
1314
- ipykernel
1415
- ipywidgets # silence nbsphinx warning

ci/requirements/min-all-deps.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ dependencies:
1616
- dask-core=2022.7
1717
- distributed=2022.7
1818
- flox=0.5
19-
- h5netcdf=1.0
19+
- h5netcdf=1.1
2020
# h5py and hdf5 tend to cause conflicts
2121
# for e.g. hdf5 1.12 conflicts with h5py=3.1
2222
# prioritize bumping other packages instead
23-
- h5py=3.6
23+
- h5py=3.7
2424
- hdf5=1.12
2525
- hypothesis
2626
- iris=3.2

doc/_static/dataset-diagram-build.sh

-2
This file was deleted.

doc/_static/dataset-diagram-logo.pdf

-13 KB
Binary file not shown.

doc/_static/dataset-diagram-logo.png

-114 KB
Binary file not shown.

0 commit comments

Comments
 (0)