Merge branch 'main' into lazy-extract-levels

ESMValGroup · May 23, 2023 · 6f5f6d2 · 6f5f6d2
2 parents 5a96946 + 64f7c0f
commit 6f5f6d2
Show file tree

Hide file tree

Showing 38 changed files with 848 additions and 380 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -166,7 +166,7 @@ jobs:
             mkdir /logs
             # conda update -y conda > /logs/conda.txt 2>&1
             # Create and activate conda environment
-            mamba create -y --name esmvaltool 'python=3.10'
+            mamba create -y --name esmvaltool 'python=3.11'
             set +x; conda activate esmvaltool; set -x
             # Install
             mamba install -y esmvalcore

diff --git a/.github/workflows/build-and-deploy-on-pypi.yml b/.github/workflows/build-and-deploy-on-pypi.yml
@@ -16,10 +16,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/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml
@@ -21,13 +21,15 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
-          python-version: "3.10"
-          miniconda-version: "latest"
           activate-environment: esmvaltool-fromlock
-          channels: conda-forge
+          python-version: "3.11"
+          miniforge-version: "latest"
+          miniforge-variant: Mambaforge
+          use-mamba: true
       - name: Show conda config
         shell: bash -l {0}
         run: |
+          conda update -n base -c conda-forge conda
           conda info
           conda list
           conda config --show-sources
@@ -39,7 +41,10 @@ jobs:
           python --version
       - name: Install conda-lock
         shell: bash -l {0}
-        run: conda install -y conda-lock
+        run: mamba install -y conda-lock
+      - name: Check version of conda-lock
+        shell: bash -l {0}
+        run: conda-lock --version
       - name: Create conda lock file for linux-64
         shell: bash -l {0}
         run: conda-lock lock --platform linux-64 -f environment.yml --mamba --kind explicit
@@ -48,7 +53,7 @@ jobs:
         run: conda create --name esmvaltool-fromlock --file conda-linux-64.lock
       - name: Installing pip
         shell: bash -l {0}
-        run: conda install pip
+        run: mamba install -y pip
       - name: Gather pip info
         shell: bash -l {0}
         run: pip --version
@@ -57,6 +62,9 @@ jobs:
         run: |
           which python
           python --version
+      - name: Show environment contents
+        shell: bash -l {0}
+        run: conda list
       - shell: bash -l {0}
         run: pip install -e .[develop]
       - shell: bash -l {0}

diff --git a/.github/workflows/install-from-conda.yml b/.github/workflows/install-from-conda.yml
@@ -34,6 +34,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
+        # TODO add "3.11" once we have the package built
         python-version: ["3.8", "3.9", "3.10"]
       # fail-fast set to False allows all other tests
       # in the worflow to run regardless of any fail

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

diff --git a/.github/workflows/install-from-pypi.yml b/.github/workflows/install-from-pypi.yml
@@ -34,6 +34,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
+        # TODO add "3.11" once we have the package built
         python-version: ["3.8", "3.9", "3.10"]
       # fail-fast set to False allows all other tests
       # in the workflow to run regardless of any fail

diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "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.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}
     steps:

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

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
       fail-fast: false
     name: Linux Python ${{ matrix.python-version }}
     steps:
@@ -72,7 +72,7 @@ jobs:
     runs-on: "macos-latest"
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
       fail-fast: false
     name: OSX Python ${{ matrix.python-version }}
     steps:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ exclude: |
   ^esmvalcore/preprocessor/ne_masks/
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -19,15 +19,15 @@ repos:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
   - repo: https://github.com/adrienverge/yamllint
-    rev: 'v1.28.0'
+    rev: 'v1.31.0'
     hooks:
       - id: yamllint
   - repo: https://github.com/codespell-project/codespell
-    rev: 'v2.2.2'
+    rev: 'v2.2.4'
     hooks:
       - id: codespell
   - repo: https://github.com/PyCQA/isort
-    rev: '5.10.1'
+    rev: '5.12.0'
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/mirrors-yapf
@@ -37,15 +37,15 @@ repos:
         additional_dependencies:
           - 'toml'
   - repo: https://github.com/myint/docformatter
-    rev: 'v1.5.0'
+    rev: 'v1.6.5'
     hooks:
       - id: docformatter
   - repo: https://github.com/pycqa/flake8
-    rev: '5.0.4'
+    rev: '6.0.0'
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v0.991'
+    rev: 'v1.2.0'
     hooks:
       - id: mypy
         additional_dependencies:

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -12,7 +12,7 @@ build:
     python: "mambaforge-4.10"
   jobs:
     post_create_environment:
-      - pip install . --no-deps
+      - conda run -n ${CONDA_DEFAULT_ENV} pip install . --no-deps
 
 # Declare the requirements required to build your docs
 conda: