Merge branch 'main' into add_expand_dims

pydata · Dec 1, 2023 · fbe2d9f · fbe2d9f
2 parents 5e44391 + c93b31a
commit fbe2d9f
Show file tree

Hide file tree

Showing 90 changed files with 2,280 additions and 2,138 deletions.
diff --git a/.binder/environment.yml b/.binder/environment.yml
@@ -2,11 +2,10 @@ name: xarray-examples
 channels:
   - conda-forge
 dependencies:
-  - python=3.9
+  - python=3.10
   - boto3
   - bottleneck
   - cartopy
-  - cdms2
   - cfgrib
   - cftime
   - coveralls
@@ -25,7 +24,7 @@ dependencies:
   - numpy
   - packaging
   - pandas
-  - pint
+  - pint>=0.22
   - pip
   - pooch
   - pydap
@@ -38,5 +37,4 @@ dependencies:
   - toolz
   - xarray
   - zarr
-  - pip:
-    - numbagg
+  - numbagg
diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
@@ -2,10 +2,10 @@ name: CI Additional
 on:
   push:
     branches:
-      - "*"
+      - "main"
   pull_request:
     branches:
-      - "*"
+      - "main"
   workflow_dispatch: # allows you to trigger manually
 
 concurrency:
@@ -41,7 +41,7 @@ jobs:
 
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
-      PYTHON_VERSION: "3.10"
+      PYTHON_VERSION: "3.11"
 
     steps:
       - uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
         shell: bash -l {0}
     env:
       CONDA_ENV_FILE: ci/requirements/environment.yml
-      PYTHON_VERSION: "3.10"
+      PYTHON_VERSION: "3.11"
 
     steps:
       - uses: actions/checkout@v4
@@ -117,7 +117,7 @@ jobs:
           python xarray/util/print_versions.py
       - name: Install mypy
         run: |
-          python -m pip install mypy --force-reinstall
+          python -m pip install "mypy<1.7" --force-reinstall
 
       - name: Run mypy
         run: |
@@ -171,7 +171,7 @@ jobs:
           python xarray/util/print_versions.py
       - name: Install mypy
         run: |
-          python -m pip install mypy --force-reinstall
+          python -m pip install "mypy<1.7" --force-reinstall
 
       - name: Run mypy
         run: |
@@ -332,7 +332,7 @@ jobs:
         with:
           environment-name: xarray-tests
           create-args: >-
-            python=3.10
+            python=3.11
             pyyaml
             conda
             python-dateutil

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,10 +2,10 @@ name: CI
 on:
   push:
     branches:
-      - "*"
+      - "main"
   pull_request:
     branches:
-      - "*"
+      - "main"
   workflow_dispatch: # allows you to trigger manually
 
 concurrency:
@@ -67,13 +67,7 @@ jobs:
         run: |
           echo "TODAY=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
-          if [[ "${{matrix.python-version}}" == "3.11" ]]; then
-            if [[ ${{matrix.os}} == windows* ]]; then
-              echo "CONDA_ENV_FILE=ci/requirements/environment-windows-py311.yml" >> $GITHUB_ENV
-            else
-              echo "CONDA_ENV_FILE=ci/requirements/environment-py311.yml" >> $GITHUB_ENV
-            fi
-          elif [[ ${{ matrix.os }} == windows* ]] ;
+          if [[ ${{ matrix.os }} == windows* ]] ;
           then
             echo "CONDA_ENV_FILE=ci/requirements/environment-windows.yml" >> $GITHUB_ENV
           elif [[ "${{ matrix.env }}" != "" ]] ;

diff --git a/.github/workflows/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
@@ -50,7 +50,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -110,17 +110,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11"]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Fetch all history for all branches and tags.
       - name: Set up conda environment
-        uses: mamba-org/provision-with-micromamba@v15
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: ci/requirements/environment.yml
           environment-name: xarray-tests
-          extra-specs: |
+          create-args: >-
             python=${{ matrix.python-version }}
             pytest-reportlog
             conda

diff --git a/ci/requirements/all-but-dask.yml b/ci/requirements/all-but-dask.yml
@@ -3,13 +3,11 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  - python=3.10
   - black
   - aiobotocore
   - boto3
   - bottleneck
   - cartopy
-  - cdms2
   - cftime
   - coveralls
   - flox
@@ -26,9 +24,8 @@ dependencies:
   - numpy
   - packaging
   - pandas
-  - pint<0.21
+  - pint>=0.22
   - pip
-  - pseudonetcdf
   - pydap
   - pytest
   - pytest-cov

diff --git a/ci/requirements/environment-py311.yml b/ci/requirements/environment-py311.yml
diff --git a/ci/requirements/environment-windows-py311.yml b/ci/requirements/environment-windows-py311.yml
diff --git a/ci/requirements/environment-windows.yml b/ci/requirements/environment-windows.yml
@@ -5,7 +5,6 @@ dependencies:
   - boto3
   - bottleneck
   - cartopy
-  # - cdms2  # Not available on Windows
   - cftime
   - dask-core
   - distributed
@@ -25,10 +24,9 @@ dependencies:
   - numpy
   - packaging
   - pandas
-  - pint<0.21
+  - pint>=0.22
   - pip
   - pre-commit
-  - pseudonetcdf
   - pydap
   - pytest
   - pytest-cov

diff --git a/ci/requirements/environment.yml b/ci/requirements/environment.yml
@@ -7,7 +7,6 @@ dependencies:
   - boto3
   - bottleneck
   - cartopy
-  - cdms2
   - cftime
   - dask-core
   - distributed
@@ -29,11 +28,10 @@ dependencies:
   - opt_einsum
   - packaging
   - pandas
-  - pint<0.21
+  - pint>=0.22
   - pip
   - pooch
   - pre-commit
-  - pseudonetcdf
   - pydap
   - pytest
   - pytest-cov

diff --git a/ci/requirements/min-all-deps.yml b/ci/requirements/min-all-deps.yml
@@ -11,17 +11,16 @@ dependencies:
   - boto3=1.24
   - bottleneck=1.3
   - cartopy=0.20
-  - cdms2=3.1
   - cftime=1.6
   - coveralls
   - dask-core=2022.7
   - distributed=2022.7
   - flox=0.5
-  - h5netcdf=1.0
+  - h5netcdf=1.1
   # h5py and hdf5 tend to cause conflicts
   # for e.g. hdf5 1.12 conflicts with h5py=3.1
   # prioritize bumping other packages instead
-  - h5py=3.6
+  - h5py=3.7
   - hdf5=1.12
   - hypothesis
   - iris=3.2
@@ -35,9 +34,8 @@ dependencies:
   - numpy=1.22
   - packaging=21.3
   - pandas=1.4
-  - pint=0.19
+  - pint=0.22
   - pip
-  - pseudonetcdf=3.2
   - pydap=3.3
   - pytest
   - pytest-cov

diff --git a/doc/_static/style.css b/doc/_static/style.css
@@ -7,6 +7,11 @@ table.docutils td {
     word-wrap: break-word;
 }
 
+div.bd-header-announcement {
+  background-color: unset;
+  color: #000;
+}
+
 /* Reduce left and right margins */
 
 .container, .container-lg, .container-md, .container-sm, .container-xl {

diff --git a/doc/api-hidden.rst b/doc/api-hidden.rst
@@ -591,20 +591,6 @@
    backends.H5netcdfBackendEntrypoint.guess_can_open
    backends.H5netcdfBackendEntrypoint.open_dataset
 
-   backends.PseudoNetCDFDataStore.close
-   backends.PseudoNetCDFDataStore.get_attrs
-   backends.PseudoNetCDFDataStore.get_dimensions
-   backends.PseudoNetCDFDataStore.get_encoding
-   backends.PseudoNetCDFDataStore.get_variables
-   backends.PseudoNetCDFDataStore.open
-   backends.PseudoNetCDFDataStore.open_store_variable
-   backends.PseudoNetCDFDataStore.ds
-
-   backends.PseudoNetCDFBackendEntrypoint.description
-   backends.PseudoNetCDFBackendEntrypoint.url
-   backends.PseudoNetCDFBackendEntrypoint.guess_can_open
-   backends.PseudoNetCDFBackendEntrypoint.open_dataset
-
    backends.PydapDataStore.close
    backends.PydapDataStore.get_attrs
    backends.PydapDataStore.get_dimensions