Merge branch 'main' of github.com:ESMValGroup/ESMValCore into paralle…

…l-load
ESMValGroup · Oct 17, 2024 · d19ce4d · d19ce4d
2 parents 4057950 + f622e40
commit d19ce4d
Show file tree

Hide file tree

Showing 143 changed files with 2,776 additions and 2,113 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,14 +21,18 @@ commands:
  circleci step halt
  fi
  test_and_report:
+ parameters:
+ args:
+ type: string
+ default: ""
  steps:
  - run:
  name: Run tests
  command: |
  mkdir -p test-reports
  . /opt/conda/etc/profile.d/conda.sh
  conda activate esmvaltool
- pytest -n 4 --junitxml=test-reports/report.xml
+ pytest -n 4 --junitxml=test-reports/report.xml << parameters.args >>
  esmvaltool version
  - store_test_results:
  path: test-reports/report.xml
@@ -127,8 +131,9 @@ jobs:
  . /opt/conda/etc/profile.d/conda.sh
  mkdir /logs
  conda activate esmvaltool
- pip install .[test] |& tee -a /logs/install.txt
- - test_and_report
+ pip install .[test] > /logs/install.txt 2>&1
+ - test_and_report:
+ args: --cov
  - save_cache:
  key: test-{{ .Branch }}-{{ checksum "cache_key.txt" }}
  paths:
@@ -149,15 +154,15 @@ jobs:
  test_installation_from_source_test_mode:
  # Test installation from source
  docker:
- - image: condaforge/mambaforge
+ - image: condaforge/miniforge3
  resource_class: large
  steps:
  - test_installation_from_source
 
  test_installation_from_source_develop_mode:
  # Test development installation
  docker:
- - image: condaforge/mambaforge
+ - image: condaforge/miniforge3
  resource_class: large
  steps:
  - test_installation_from_source:
@@ -167,7 +172,7 @@ jobs:
  test_with_upstream_developments:
  # Test with development versions of upstream packages
  docker:
- - image: condaforge/mambaforge
+ - image: condaforge/miniforge3
  resource_class: large
  steps:
  - test_installation_from_source:
@@ -187,7 +192,7 @@ jobs:
  # Test conda package installation
  working_directory: /esmvaltool
  docker:
- - image: condaforge/mambaforge
+ - image: condaforge/miniforge3
  resource_class: medium
  steps:
  - run:
@@ -209,7 +214,7 @@ jobs:
  build_documentation:
  # Test building documentation
  docker:
- - image: condaforge/mambaforge
+ - image: condaforge/miniforge3
  resource_class: medium
  steps:
  - checkout
@@ -236,7 +241,6 @@ workflows:
  - run_tests
  - test_installation_from_source_develop_mode
  - test_installation_from_source_test_mode
- - test_with_upstream_developments
 
  nightly:
  triggers:

diff --git a/.circleci/install_triggers b/.circleci/install_triggers
@@ -1,5 +1,3 @@
 ^\.circleci/
 ^environment\.yml$
 ^pyproject.toml$
-^setup\.py$
-^setup\.cfg$
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Use ruff formatter (#2524)
+436558caacda69d4966a5aff35959ce9188cac37
diff --git a/.github/workflows/create-condalock-file.yml b/.github/workflows/create-condalock-file.yml
@@ -29,7 +29,6 @@ jobs:
  activate-environment: esmvaltool-fromlock
  python-version: "3.12"
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - name: Update and show conda config
  run: |

diff --git a/.github/workflows/install-from-conda.yml b/.github/workflows/install-from-conda.yml
@@ -49,7 +49,6 @@ jobs:
  with:
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p conda_install_linux_artifacts_python_${{ matrix.python-version }}
  - name: Record versions
@@ -85,7 +84,6 @@ jobs:
  architecture: ${{ matrix.architecture }}
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p conda_install_osx_artifacts_python_${{ matrix.python-version }}
  - name: Record versions

diff --git a/.github/workflows/install-from-pypi.yml b/.github/workflows/install-from-pypi.yml
@@ -52,7 +52,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p pip_install_linux_artifacts_python_${{ matrix.python-version }}
  - name: Record versions
@@ -90,7 +89,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p pip_install_osx_artifacts_python_${{ matrix.python-version }}
  - name: Record versions

diff --git a/.github/workflows/install-from-source.yml b/.github/workflows/install-from-source.yml
@@ -50,7 +50,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p source_install_linux_artifacts_python_${{ matrix.python-version }}
  - name: Record versions
@@ -89,7 +88,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p source_install_osx_artifacts_python_${{ matrix.python-version }}
  - name: Record versions

diff --git a/.github/workflows/run-tests-monitor.yml b/.github/workflows/run-tests-monitor.yml
@@ -35,7 +35,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p test_linux_artifacts_python_${{ matrix.python-version }}
  - run: conda --version 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/conda_version.txt
@@ -70,7 +69,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
  - run: conda --version 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -52,7 +52,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p test_linux_artifacts_python_${{ matrix.python-version }}
  - run: conda --version 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/conda_version.txt
@@ -90,7 +89,6 @@ jobs:
  environment-file: environment.yml
  python-version: ${{ matrix.python-version }}
  miniforge-version: "latest"
- miniforge-variant: Mambaforge
  use-mamba: true
  - run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
  - run: conda --version 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ exclude: |
 
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.6.0
+ rev: v5.0.0
  hooks:
  - id: check-added-large-files
  - id: check-ast
@@ -33,7 +33,7 @@ repos:
  - id: codespell
  additional_dependencies: [tomli] # required for Python 3.10
  - repo: https://github.com/astral-sh/ruff-pre-commit
- rev: "v0.6.8"
+ rev: "v0.6.9"
  hooks:
  - id: ruff
  args: [--fix]