Merge branch 'main' of github.com:ESMValGroup/ESMValCore into misc-lazy

.circleci/config.yml

@@ -28,7 +28,6 @@ commands:
             mkdir -p test-reports
             . /opt/conda/etc/profile.d/conda.sh
             conda activate esmvaltool
-            flake8 -j 4
             pytest -n 4 --junitxml=test-reports/report.xml
             esmvaltool version
       - store_test_results:

.editorconfig

@@ -27,4 +27,3 @@ indent_size = 2
 
 [*.{md,Rmd}]
 trim_trailing_whitespace = false
-

.github/CODEOWNERS

@@ -1,3 +1 @@
-esmvalcore/cmor @jvegasbsc
 .github/workflows @valeriupredoi
-

.github/workflows/create-condalock-file.yml

@@ -71,8 +71,6 @@ jobs:
         run: |
           esmvaltool --help
           esmvaltool version
-      - name: Run flake8
-        run: flake8
       - name: Run pytests
         run: pytest -n 2 -m "not installation"
       # Automated PR

.github/workflows/install-from-condalock-file.yml

@@ -51,7 +51,6 @@ jobs:
       - run: pip install -e .[develop]
       - run: esmvaltool --help
       - run: esmvaltool version 2>&1 | tee source_install_linux_artifacts_python_${{ matrix.python-version }}/version.txt
-      - run: flake8
       - run: pytest -n 2 -m "not installation"
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail

.github/workflows/run-tests.yml

@@ -60,7 +60,9 @@ jobs:
       - run: conda list
       - run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
       - run: conda list
-      - run: flake8
+      - run: |
+          pre-commit install
+          pre-commit run -a
       - run: pytest -n 2 -m "not installation" 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/test_report.txt
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail
@@ -97,7 +99,9 @@ jobs:
       - run: conda list
       - run: pip install -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
       - run: conda list
-      - run: flake8
+      - run: |
+          pre-commit install
+          pre-commit run -a
       - run: pytest -n 2 -m "not installation" 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/test_report.txt
       - name: Upload artifacts
         if: ${{ always() }}  # upload artifacts even if fail

.pre-commit-config.yaml

@@ -1,14 +1,19 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 ---
+ci:
+  autofix_prs: false
+
 exclude: |
   (?x)
   ^doc/conf.py|
   ^esmvalcore/cmor/tables/|
-  ^esmvalcore/preprocessor/ne_masks/
+  ^esmvalcore/preprocessor/ne_masks/|
+  ^esmvalcore/preprocessor/shapefiles/
+
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -19,33 +24,22 @@ repos:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
   - repo: https://github.com/adrienverge/yamllint
-    rev: 'v1.31.0'
+    rev: 'v1.35.1'
     hooks:
       - id: yamllint
   - repo: https://github.com/codespell-project/codespell
-    rev: 'v2.2.4'
+    rev: 'v2.3.0'
     hooks:
       - id: codespell
-  - repo: https://github.com/PyCQA/isort
-    rev: '5.12.0'
+        additional_dependencies: [tomli]  # required for Python 3.10
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.6.8"
     hooks:
-      - id: isort
-  - repo: https://github.com/pre-commit/mirrors-yapf
-    rev: 'v0.32.0'
-    hooks:
-      - id: yapf
-        additional_dependencies:
-          - 'toml'
-  - repo: https://github.com/myint/docformatter
-    rev: 'v1.6.5'
-    hooks:
-      - id: docformatter
-  - repo: https://github.com/pycqa/flake8
-    rev: '6.0.0'
-    hooks:
-      - id: flake8
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.2.0'
+    rev: 'v1.11.2'
     hooks:
       - id: mypy
         additional_dependencies:

.prospector.yml

@@ -10,16 +10,21 @@ test-warnings: true
 member-warnings: false
 
 pyroma:
-    run: true
+  run: true
 
 pep8:
-    full: true
+  full: true
+  # ignore rules that conflict with ruff formatter
+  # E203: https://black.readthedocs.io/en/stable/the_black_code_style/current_style.html#slices
+  # E501: https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+  # W503: https://pycodestyle.pycqa.org/en/latest/intro.html#error-codes
+  disable: ['E203', 'E501', 'W503']
 
 mypy:
   run: true
 
 pep257:
-    # disable rules that are allowed by the numpy convention
-    # see https://github.com/PyCQA/pydocstyle/blob/master/src/pydocstyle/violations.py
-    # and http://pydocstyle.readthedocs.io/en/latest/error_codes.html
-    disable: ['D107', 'D203', 'D212', 'D213', 'D402', 'D413', 'D416']
+  # disable rules that are allowed by the numpy convention
+  # see https://github.com/PyCQA/pydocstyle/blob/master/src/pydocstyle/violations.py
+  # and http://pydocstyle.readthedocs.io/en/latest/error_codes.html
+  disable: ['D107', 'D203', 'D212', 'D213', 'D402', 'D413', 'D416']

.yamllint

@@ -0,0 +1,9 @@
+---
+
+extends: default
+
+rules:
+  line-length:
+    level: warning
+    max: 120
+  octal-values: enable

CITATION.cff

@@ -208,7 +208,7 @@ authors:
     affiliation: "DLR, Germany"
     family-names: Cammarano
     given-names: Diego
-  - 
+  -
     affiliation: "ACCESS-NRI, Australia"
     family-names: Yousong
     given-names: Zeng

CODE_OF_CONDUCT.md

@@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
+level of experience, education, socioeconomic status, nationality, personal
 appearance, race, religion, or sexual identity and orientation.
 
 ## Our Standards

NOTICE

@@ -50,5 +50,3 @@ In addition to using the Software, we encourage the community to join the Softwa
 To join the ESMValTool Development Team, please contact Dr. Birgit Hassler (birgit.hassler@dlr.de) and Dr. Axel Lauer (axel.lauer@dlr.de).
 
 ==========================================
-
-

README.md

@@ -10,7 +10,7 @@
 [![Anaconda-Server Badge](https://img.shields.io/conda/vn/conda-forge/ESMValCore?color=blue&label=conda-forge&logo=conda-forge&logoColor=white)](https://anaconda.org/conda-forge/esmvalcore)
 [![Github Actions Test](https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml/badge.svg)](https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml)
 
-![esmvaltoollogo](https://raw.githubusercontent.com/ESMValGroup/ESMValCore/main/doc/figures/ESMValTool-logo-2.png)
+![esmvaltoollogo](https://raw.githubusercontent.com/ESMValGroup/ESMValCore/main/doc/figures/ESMValTool-logo-2-glow.png)
 
 ESMValCore: core functionalities for the ESMValTool, a community diagnostic
 and performance metrics tool for routine evaluation of Earth System Models