Add support for Python=3.11 (#3173)

Co-authored-by: Bouwe Andela <b.andela@esciencecenter.nl>
ESMValGroup · Jan 14, 2024 · e3b5877 · e3b5877
1 parent 5ea1f0f
commit e3b5877
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 49 deletions.
diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           auto-update-conda: true
           activate-environment: esmvaltool-fromlock
-          python-version: "3.10"
+          python-version: "3.11"
           miniforge-version: "latest"
           miniforge-variant: Mambaforge
           use-mamba: true

diff --git a/.github/workflows/install-from-conda.yml b/.github/workflows/install-from-conda.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: conda-incubator/setup-miniconda@v2
@@ -55,7 +55,7 @@ jobs:
 #    runs-on: "macos-latest"
 #    strategy:
 #      matrix:
-#        python-version: ["3.9", "3.10"]
+#        python-version: ["3.9", "3.10", "3.11"]
 #      fail-fast: false
 #    name: OSX Python ${{ matrix.python-version }}
 #    steps:

diff --git a/.github/workflows/install-from-condalock-file.yml b/.github/workflows/install-from-condalock-file.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -73,7 +73,7 @@ jobs:
 #    runs-on: "macos-latest"
 #    strategy:
 #      matrix:
-#        python-version: ["3.9", "3.10"]
+#        python-version: ["3.9", "3.10", "3.11"]
 #      fail-fast: false
 #    name: OSX Python ${{ matrix.python-version }}
 #    steps:

diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -58,7 +58,7 @@ jobs:
 #    runs-on: "macos-latest"
 #    strategy:
 #      matrix:
-#        python-version: ["3.9", "3.10"]
+#        python-version: ["3.9", "3.10", "3.11"]
 #      fail-fast: false
 #    name: OSX Python ${{ matrix.python-version }}
 #    steps:

diff --git a/.github/workflows/pypi-build-and-deploy.yml b/.github/workflows/pypi-build-and-deploy.yml
@@ -17,10 +17,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v1
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install pep517
         run: >-
           python -m

diff --git a/.github/workflows/run-tests-monitor.yml b/.github/workflows/run-tests-monitor.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -67,7 +67,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}
     steps:

diff --git a/.github/workflows/test-development.yml b/.github/workflows/test-development.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
     name: Linux Python ${{ matrix.python-version }}
     steps:
       - uses: actions/checkout@v3
@@ -59,7 +59,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        python-version: ["3.9", "3.10", "3.11"]
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}
     steps:

diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py
@@ -150,7 +150,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'sphinx_rtd_theme'
+html_theme = 'pydata_sphinx_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

diff --git a/doc/sphinx/source/quickstart/installation.rst b/doc/sphinx/source/quickstart/installation.rst
@@ -710,9 +710,9 @@ for example by running
 
 .. code-block:: bash
 
-    mamba create -n esmvaltool esmvaltool 'python=3.10'
+    mamba create -n esmvaltool esmvaltool 'python=3.11'
 
-you ask for Python 3.10 specifically and that makes it much easier for mamba to
+you ask for Python 3.11 specifically and that makes it much easier for mamba to
 solve the environment, because now it can ignore any packages that were built
 for other Python versions. Note that, since the esmvaltool package is built
 with Python>=3.9, asking for an older Python version, e.g. `python=3.7`, in

diff --git a/environment.yml b/environment.yml
@@ -9,30 +9,31 @@ channels:
   - nodefaults
 
 dependencies:
-  - pip!=21.3
-  - python>=3.9
+  - pip !=21.3
+  - python >=3.9
   - aiohttp
   - cartopy
-  - cdo>=1.9.7
+  - cdo >=1.9.7
   - cdsapi
   - cf-units
   - cftime
   - cmocean
   - cython
   - dask
+  - distributed
   - ecmwf-api-client
   - eofs
   - esmpy
   - esmvalcore 2.8.*
   - fiona
   - fire
   - gdal
-  - iris>=3.1.0
-  - iris-esmf-regrid
+  - iris >=3.6.0
+  - iris-esmf-regrid >=0.7.0
   - jinja2
   - joblib
   - lime
-  - mapgenerator>=1.0.5
+  - mapgenerator >=1.0.5
   - matplotlib-base
   - natsort
   - nc-time-axis
@@ -47,7 +48,7 @@ dependencies:
   - psy-maps
   - psy-reg
   - psy-simple
-  - pyproj>=2.1
+  - pyproj >=2.1
   - python-cdo
   - python-dateutil
   - pyyaml
@@ -59,10 +60,10 @@ dependencies:
   - scipy
   - seaborn
   - seawater
-  - shapely <2.0.0  # github.com/ESMValGroup/ESMValTool/issues/2965
-  - xarray>=0.12.0
-  - xesmf>=0.7.1
-  - xgboost>1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
+  - shapely
+  - xarray >=0.12.0
+  - xesmf >=0.7.1
+  - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
   - xlsxwriter
   - zarr
   # Python packages needed for testing
@@ -75,10 +76,10 @@ dependencies:
   - pytest-mock
   - pytest-xdist
   # Python packages needed for building docs
-  - autodocsumm>=0.2.2
+  - autodocsumm >=0.2.2
   - nbsphinx
-  - sphinx>=6.1.3
-  - sphinx_rtd_theme
+  - sphinx >=6.1.3
+  - pydata-sphinx-theme
   # Python packages needed for development
   - codespell
   - docformatter

diff --git a/environment_osx.yml b/environment_osx.yml
@@ -9,30 +9,31 @@ channels:
   - nodefaults
 
 dependencies:
-  - pip!=21.3
-  - python>=3.9
+  - pip !=21.3
+  - python >=3.9
   - aiohttp
   - cartopy
-  - cdo>=1.9.7
+  - cdo >=1.9.7
   - cdsapi
   - cf-units
   - cftime
   - cmocean
   - cython
   - dask
+  - distributed
   - ecmwf-api-client
   - eofs
   - esmpy
   - esmvalcore 2.8.*
   - fiona
   - fire
   - gdal
-  - iris>=3.1.0
-  - iris-esmf-regrid
+  - iris >=3.6.0
+  - iris-esmf-regrid >=0.7.0
   - jinja2
   - joblib
   - lime
-  - mapgenerator>=1.0.5
+  - mapgenerator >=1.0.5
   - matplotlib-base
   - natsort
   - nc-time-axis
@@ -60,9 +61,9 @@ dependencies:
   - seaborn
   - seawater
   - shapely
-  - xarray>=0.12.0
-  - xesmf>=0.7.1
-  - xgboost>1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
+  - xarray >=0.12.0
+  - xesmf >=0.7.1
+  - xgboost >1.6.1  # github.com/ESMValGroup/ESMValTool/issues/2779
   - xlsxwriter
   - zarr
   # Python packages needed for testing
@@ -75,10 +76,10 @@ dependencies:
   - pytest-mock
   - pytest-xdist
   # Python packages needed for building docs
-  - autodocsumm>=0.2.2
+  - autodocsumm >=0.2.2
   - nbsphinx
-  - sphinx>=6.1.3
-  - sphinx_rtd_theme
+  - sphinx >=6.1.3
+  - pydata-sphinx-theme
   # Python packages needed for development
   - codespell
   - docformatter

diff --git a/setup.py b/setup.py
@@ -28,11 +28,12 @@
         'cftime',
         'cmocean',
         'dask',
+        'distributed',
         'ecmwf-api-client',
         'eofs',
         'ESMPy',
         'esmvalcore',
-        'esmf-regrid',
+        'esmf-regrid>=0.7.0',
         'fiona',
         'GDAL',
         'jinja2',
@@ -47,7 +48,7 @@
         'packaging',
         'openpyxl',
         'pandas',
-        'pyproj',
+        'pyproj>=2.1',
         'pyyaml',
         'progressbar2',
         'psyplot',
@@ -59,11 +60,11 @@
         'scikit-image',
         'scikit-learn',
         'scipy',
-        'scitools-iris',
+        'scitools-iris>=3.6.0',
         'seaborn',
         'seawater',
-        'shapely<2.0.0',  # github.com/ESMValGroup/ESMValTool/issues/2965
-        'xarray',
+        'shapely',
+        'xarray>=0.12.0',
         'xesmf>=0.7.1',
         'xgboost>1.6.1',  # github.com/ESMValGroup/ESMValTool/issues/2779
         'xlsxwriter',
@@ -86,7 +87,7 @@
         'autodocsumm>=0.2.2',
         'nbsphinx',
         'sphinx>=6.1.3',
-        'sphinx_rtd_theme',
+        'pydata-sphinx-theme',
     ],
     # Development dependencies
     # Use pip install -e .[develop] to install in development mode
@@ -105,6 +106,7 @@
 
 def discover_python_files(paths, ignore):
     """Discover Python files."""
+
     def _ignore(path):
         """Return True if `path` should be ignored, False otherwise."""
         return any(re.match(pattern, path) for pattern in ignore)
@@ -214,6 +216,7 @@ def read_description(filename):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Atmospheric Science',
         'Topic :: Scientific/Engineering :: GIS',