Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exclude: |
^esmvaltool/utils/nclcodestyle/
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -21,7 +21,7 @@ repos:
- id: trailing-whitespace
args: [--markdown-linebreak-ext=md]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.12.2"
rev: "v0.13.0"
hooks:
- id: ruff
args:
Expand Down
27 changes: 0 additions & 27 deletions .prospector.yml

This file was deleted.

3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ dependencies:
- codespell ==2.3.0
- docformatter ==1.7.5
- imagehash
- prospector >=1.12 # earliest support for Python 3.12
- pyroma
- ruff == 0.13.0 # keep in sync with .pre-commit-config.yaml
# - vprof not on conda-forge
- yamllint ==1.35.1

Expand Down
3 changes: 1 addition & 2 deletions environment_osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ dependencies:
- codespell ==2.3.0
- docformatter ==1.7.5
- imagehash
- prospector >=1.12 # earliest support for Python 3.12
- pyroma
- ruff == 0.13.0 # keep in sync with .pre-commit-config.yaml
# - vprof not on conda-forge
- yamllint ==1.35.1
45 changes: 21 additions & 24 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,28 @@ line-length = 79
show-fixes = true

[tool.ruff.lint]
select = ["ALL"]
select = [
"B",
"C901",
"D",
"E",
"F",
"I",
"ISC001",
"UP",
"W",
"PL",
]
# syntax from github.com/astral-sh/ruff/issues/10878
exclude = ["archive/*"]
ignore = [
'D107',
'D203',
'D212',
'D213',
'D402',
'D413',
'D416',
# TODO: when replacing `prospector` with `ruff`, ignore rules that are
# overly technical or conflict with other rules.
"E501", # Disable line-too-long as this is taken care of by the formatter.
Expand Down Expand Up @@ -242,29 +260,8 @@ convention = "numpy"
[tool.ruff.lint.pylint]
max-args = 7

[tool.pylint.main]
jobs = 1 # Running more than one job in parallel crashes prospector.
ignore-paths = [
"doc/sphinx/source/conf.py", # Sphinx configuration file
]

[tool.pylint.basic]
good-names = [
"_", # Used by convention for unused variables
"i", "j", "k", # Used by convention for indices
"logger", # Our preferred name for the logger
]

[tool.pylint.format]
max-line-length = 79

[tool.pylint."messages control"]
disable = [
"import-error", # Needed because Codacy does not install dependencies
"file-ignored", # Disable messages about disabling checks
"line-too-long", # Disable line-too-long as this is taken care of by the formatter.
"locally-disabled", # Disable messages about disabling checks
]
[tool.ruff.lint.mccabe]
max-complexity = 15

[tool.pydocstyle]
convention = "numpy"
6 changes: 0 additions & 6 deletions setup.cfg

This file was deleted.