Skip to content

Commit 8cdce90

Browse files
committed
Merge branch 'main' into fix-zarr-append
* main: [skip-ci] dev whats-new (pydata#8467) 2023.11.0 Whats-new (pydata#8461) migrate the other CI to python 3.11 (pydata#8416) preserve vlen string dtypes, allow vlen string fill_values (pydata#7869) Pin mypy < 1.7 (pydata#8458) Fix typos found by codespell (pydata#8457) [skip-ci] Small updates to IO docs. (pydata#8452) Deprecate certain cftime frequency strings following pandas (pydata#8415) Added driver parameter for h5netcdf (pydata#8360) Raise exception in to_dataset if resulting variable is also the name of a coordinate (pydata#8433) Automatic region detection and transpose for `to_zarr()` (pydata#8434) remove `cdms2` (pydata#8441) Remove PseudoNetCDF (pydata#8446) Pin pint to >=0.22 (pydata#8445) Remove keep_attrs from resample signature (pydata#8444) Rename `to_array` to `to_dataarray` (pydata#8438) Add missing DataArray.dt.total_seconds() method (pydata#8435) Declare Dataset, DataArray, Variable, GroupBy unhashable (pydata#8392)
2 parents f472e9c + bb8511e commit 8cdce90

Some content is hidden

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

69 files changed

+1183
-1407
lines changed

.binder/environment.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ name: xarray-examples
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.9
5+
- python=3.10
66
- boto3
77
- bottleneck
88
- cartopy
9-
- cdms2
109
- cfgrib
1110
- cftime
1211
- coveralls
@@ -25,7 +24,7 @@ dependencies:
2524
- numpy
2625
- packaging
2726
- pandas
28-
- pint
27+
- pint>=0.22
2928
- pip
3029
- pooch
3130
- pydap
@@ -38,5 +37,4 @@ dependencies:
3837
- toolz
3938
- xarray
4039
- zarr
41-
- pip:
42-
- numbagg
40+
- numbagg

.github/workflows/ci-additional.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: CI Additional
22
on:
33
push:
44
branches:
5-
- "*"
5+
- "main"
66
pull_request:
77
branches:
8-
- "*"
8+
- "main"
99
workflow_dispatch: # allows you to trigger manually
1010

1111
concurrency:
@@ -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
@@ -87,7 +87,7 @@ jobs:
8787
shell: bash -l {0}
8888
env:
8989
CONDA_ENV_FILE: ci/requirements/environment.yml
90-
PYTHON_VERSION: "3.10"
90+
PYTHON_VERSION: "3.11"
9191

9292
steps:
9393
- uses: actions/checkout@v4
@@ -117,7 +117,7 @@ jobs:
117117
python xarray/util/print_versions.py
118118
- name: Install mypy
119119
run: |
120-
python -m pip install mypy --force-reinstall
120+
python -m pip install "mypy<1.7" --force-reinstall
121121
122122
- name: Run mypy
123123
run: |
@@ -171,7 +171,7 @@ jobs:
171171
python xarray/util/print_versions.py
172172
- name: Install mypy
173173
run: |
174-
python -m pip install mypy --force-reinstall
174+
python -m pip install "mypy<1.7" --force-reinstall
175175
176176
- name: Run mypy
177177
run: |
@@ -332,7 +332,7 @@ jobs:
332332
with:
333333
environment-name: xarray-tests
334334
create-args: >-
335-
python=3.10
335+
python=3.11
336336
pyyaml
337337
conda
338338
python-dateutil

.github/workflows/ci.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: CI
22
on:
33
push:
44
branches:
5-
- "*"
5+
- "main"
66
pull_request:
77
branches:
8-
- "*"
8+
- "main"
99
workflow_dispatch: # allows you to trigger manually
1010

1111
concurrency:
@@ -67,13 +67,7 @@ jobs:
6767
run: |
6868
echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
6969
70-
if [[ "${{matrix.python-version}}" == "3.11" ]]; then
71-
if [[ ${{matrix.os}} == windows* ]]; then
72-
echo "CONDA_ENV_FILE=ci/requirements/environment-windows-py311.yml" >> $GITHUB_ENV
73-
else
74-
echo "CONDA_ENV_FILE=ci/requirements/environment-py311.yml" >> $GITHUB_ENV
75-
fi
76-
elif [[ ${{ matrix.os }} == windows* ]] ;
70+
if [[ ${{ matrix.os }} == windows* ]] ;
7771
then
7872
echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
7973
elif [[ "${{ matrix.env }}" != "" ]] ;

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

Lines changed: 4 additions & 4 deletions
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

ci/requirements/all-but-dask.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6-
- python=3.10
76
- black
87
- aiobotocore
98
- boto3
109
- bottleneck
1110
- cartopy
12-
- cdms2
1311
- cftime
1412
- coveralls
1513
- flox
@@ -26,9 +24,8 @@ dependencies:
2624
- numpy
2725
- packaging
2826
- pandas
29-
- pint<0.21
27+
- pint>=0.22
3028
- pip
31-
- pseudonetcdf
3229
- pydap
3330
- pytest
3431
- pytest-cov

ci/requirements/environment-py311.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

ci/requirements/environment-windows-py311.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

ci/requirements/environment-windows.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ dependencies:
55
- boto3
66
- bottleneck
77
- cartopy
8-
# - cdms2 # Not available on Windows
98
- cftime
109
- dask-core
1110
- distributed
@@ -25,10 +24,9 @@ dependencies:
2524
- numpy
2625
- packaging
2726
- pandas
28-
- pint<0.21
27+
- pint>=0.22
2928
- pip
3029
- pre-commit
31-
- pseudonetcdf
3230
- pydap
3331
- pytest
3432
- pytest-cov

ci/requirements/environment.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dependencies:
77
- boto3
88
- bottleneck
99
- cartopy
10-
- cdms2
1110
- cftime
1211
- dask-core
1312
- distributed
@@ -29,11 +28,10 @@ dependencies:
2928
- opt_einsum
3029
- packaging
3130
- pandas
32-
- pint<0.21
31+
- pint>=0.22
3332
- pip
3433
- pooch
3534
- pre-commit
36-
- pseudonetcdf
3735
- pydap
3836
- pytest
3937
- pytest-cov

ci/requirements/min-all-deps.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ dependencies:
1111
- boto3=1.24
1212
- bottleneck=1.3
1313
- cartopy=0.20
14-
- cdms2=3.1
1514
- cftime=1.6
1615
- coveralls
1716
- dask-core=2022.7
1817
- distributed=2022.7
1918
- flox=0.5
20-
- h5netcdf=1.0
19+
- h5netcdf=1.1
2120
# h5py and hdf5 tend to cause conflicts
2221
# for e.g. hdf5 1.12 conflicts with h5py=3.1
2322
# prioritize bumping other packages instead
24-
- h5py=3.6
23+
- h5py=3.7
2524
- hdf5=1.12
2625
- hypothesis
2726
- iris=3.2
@@ -35,9 +34,8 @@ dependencies:
3534
- numpy=1.22
3635
- packaging=21.3
3736
- pandas=1.4
38-
- pint=0.19
37+
- pint=0.22
3938
- pip
40-
- pseudonetcdf=3.2
4139
- pydap=3.3
4240
- pytest
4341
- pytest-cov

doc/_static/style.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ table.docutils td {
77
word-wrap: break-word;
88
}
99

10+
div.bd-header-announcement {
11+
background-color: unset;
12+
color: #000;
13+
}
14+
1015
/* Reduce left and right margins */
1116

1217
.container, .container-lg, .container-md, .container-sm, .container-xl {

doc/api-hidden.rst

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -591,20 +591,6 @@
591591
backends.H5netcdfBackendEntrypoint.guess_can_open
592592
backends.H5netcdfBackendEntrypoint.open_dataset
593593

594-
backends.PseudoNetCDFDataStore.close
595-
backends.PseudoNetCDFDataStore.get_attrs
596-
backends.PseudoNetCDFDataStore.get_dimensions
597-
backends.PseudoNetCDFDataStore.get_encoding
598-
backends.PseudoNetCDFDataStore.get_variables
599-
backends.PseudoNetCDFDataStore.open
600-
backends.PseudoNetCDFDataStore.open_store_variable
601-
backends.PseudoNetCDFDataStore.ds
602-
603-
backends.PseudoNetCDFBackendEntrypoint.description
604-
backends.PseudoNetCDFBackendEntrypoint.url
605-
backends.PseudoNetCDFBackendEntrypoint.guess_can_open
606-
backends.PseudoNetCDFBackendEntrypoint.open_dataset
607-
608594
backends.PydapDataStore.close
609595
backends.PydapDataStore.get_attrs
610596
backends.PydapDataStore.get_dimensions

0 commit comments

Comments
 (0)