Skip to content

Commit b6eaf43

Browse files
keewisdcherian
andauthored
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 <[email protected]>
1 parent 74901af commit b6eaf43

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.github/workflows/ci-additional.yaml

Lines changed: 3 additions & 3 deletions
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
@@ -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
@@ -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/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

xarray/tests/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,14 @@ def _importorskip(
6363

6464
has_matplotlib, requires_matplotlib = _importorskip("matplotlib")
6565
has_scipy, requires_scipy = _importorskip("scipy")
66-
has_pydap, requires_pydap = _importorskip("pydap.client")
66+
with warnings.catch_warnings():
67+
warnings.filterwarnings(
68+
"ignore",
69+
message="'cgi' is deprecated and slated for removal in Python 3.13",
70+
category=DeprecationWarning,
71+
)
72+
73+
has_pydap, requires_pydap = _importorskip("pydap.client")
6774
has_netCDF4, requires_netCDF4 = _importorskip("netCDF4")
6875
has_h5netcdf, requires_h5netcdf = _importorskip("h5netcdf")
6976
has_pynio, requires_pynio = _importorskip("Nio")

0 commit comments

Comments
 (0)