From b6eaf436f7b120f5b6b3934892061af1e9ad89fe Mon Sep 17 00:00:00 2001
From: Justus Magin <keewis@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:27:21 +0100
Subject: [PATCH] migrate the other CI to python 3.11 (#8416)

* migrate the additional CI to py311

* migrate the upstream-dev CI to python 3.11

* switch to the default environment file

* convert a left-over use of `provision-with-micromamba`

* silence the `cgi` deprecation warning from `pydap`

---------

Co-authored-by: Deepak Cherian <dcherian@users.noreply.github.com>
---
 .github/workflows/ci-additional.yaml   | 6 +++---
 .github/workflows/upstream-dev-ci.yaml | 8 ++++----
 xarray/tests/__init__.py               | 9 ++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-additional.yaml b/.github/workflows/ci-additional.yaml
index 52f785c6a00..43f13f03133 100644
--- a/.github/workflows/ci-additional.yaml
+++ b/.github/workflows/ci-additional.yaml
@@ -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
@@ -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/upstream-dev-ci.yaml b/.github/workflows/upstream-dev-ci.yaml
index d01fc5cdffc..cb8319cc58f 100644
--- 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/xarray/tests/__init__.py b/xarray/tests/__init__.py
index fec695f83d7..8b5cf456bcb 100644
--- a/xarray/tests/__init__.py
+++ b/xarray/tests/__init__.py
@@ -63,7 +63,14 @@ def _importorskip(
 
 has_matplotlib, requires_matplotlib = _importorskip("matplotlib")
 has_scipy, requires_scipy = _importorskip("scipy")
-has_pydap, requires_pydap = _importorskip("pydap.client")
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore",
+        message="'cgi' is deprecated and slated for removal in Python 3.13",
+        category=DeprecationWarning,
+    )
+
+    has_pydap, requires_pydap = _importorskip("pydap.client")
 has_netCDF4, requires_netCDF4 = _importorskip("netCDF4")
 has_h5netcdf, requires_h5netcdf = _importorskip("h5netcdf")
 has_pynio, requires_pynio = _importorskip("Nio")