From 7603940614071c05e6fb7855597f41971e4f8183 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Wed, 29 Apr 2026 16:09:42 +0100 Subject: [PATCH 1/4] Remove erroneous scitools- prefix for project.name . --- templates/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pyproject.toml b/templates/pyproject.toml index 5eedf89..1cf9f74 100644 --- a/templates/pyproject.toml +++ b/templates/pyproject.toml @@ -36,7 +36,7 @@ keywords = [ ] license = "BSD-3-Clause" license-files = ["LICENSE"] -name = "scitools-" #e.g "scitools-iris" +name = "" # e.g "scitools-iris", "cf-units" requires-python = "" [project.urls] From f40cd3ff7249aaf804f23ae9c70bd9cb57ad0184 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Wed, 29 Apr 2026 16:16:21 +0100 Subject: [PATCH 2/4] Align with linting guidelines: SciTools/.github/wiki/Linting . --- templates/pyproject.toml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/pyproject.toml b/templates/pyproject.toml index 1cf9f74..5b61a3f 100644 --- a/templates/pyproject.toml +++ b/templates/pyproject.toml @@ -117,6 +117,7 @@ checks = [ # -> No Yields section found "YD01", # Not all docstrings require a "Yields" section. + # TODO: exceptions that still need investigating are below. Might be fixable, or might become permanent (above): ] exclude = [ '\.__eq__$', @@ -130,13 +131,15 @@ testpaths = "" # e.g "cf_units" or "lib/iris" log_level = "INFO" [tool.repo-review] -# A list of the currently failing repo-review checks, to be fixed later, different for every repository. +# A list of the currently failing repo-review checks, possibly to be fixed later, different for every repository. ignore = [ # https://learn.scientific-python.org/development/guides/style/#PC180 # Not possible to run on the hardware used by the majority of our developers. Might change in future! "PC180", # Uses prettier. # https://learn.scientific-python.org/development/guides/packaging-simple#PP006 "PP006", # Uses dev dependency group + + # TODO: exceptions that still need investigating are below. Might be fixable, or might become permanent (above): ] [tool.ruff] @@ -146,10 +149,8 @@ line-length = 88 preview = false [tool.ruff.lint] -# We have agreed that we will permanently ignore the ruff rules in this ignore list. +# We have agreed that we will permanently ignore the ruff rules in the first half of this ignore list. ignore = [ - # NOTE: Non-permanent exclusions should be added to the ".ruff.toml" file. - # flake8-commas (COM) # https://docs.astral.sh/ruff/rules/#flake8-commas-com "COM812", # Trailing comma missing. @@ -159,6 +160,8 @@ ignore = [ # https://docs.astral.sh/ruff/rules/single-line-implicit-string-concatenation/ # NOTE: This rule may cause conflicts when used with "ruff format". "ISC001", # Implicitly concatenate string literals on one line. + + # TODO: exceptions that still need investigating are below. Might be fixable, or might become permanent (above): ] preview = false select = [ From 955a874003ca6bebf3eb04128b327f41b0b00428 Mon Sep 17 00:00:00 2001 From: Martin Yeo <40734014+trexfeathers@users.noreply.github.com> Date: Thu, 30 Apr 2026 16:45:06 +0100 Subject: [PATCH 3/4] Clearer phrasing about repo-review. --- templates/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/pyproject.toml b/templates/pyproject.toml index 5b61a3f..d1533ce 100644 --- a/templates/pyproject.toml +++ b/templates/pyproject.toml @@ -131,7 +131,7 @@ testpaths = "" # e.g "cf_units" or "lib/iris" log_level = "INFO" [tool.repo-review] -# A list of the currently failing repo-review checks, possibly to be fixed later, different for every repository. +# We have agreed that we will permanently ignore the repo-review rules in the first half of this ignore list. ignore = [ # https://learn.scientific-python.org/development/guides/style/#PC180 # Not possible to run on the hardware used by the majority of our developers. Might change in future! From 0b602f5b7695a9b5510ba86b05d87b9e5db68b84 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 1 May 2026 12:19:43 +0100 Subject: [PATCH 4/4] repo-review additions from SciTools/iris@2973018dc43cee12653cd8c0fc2135eaa804fef8 . --- templates/pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/pyproject.toml b/templates/pyproject.toml index d1533ce..be8dc70 100644 --- a/templates/pyproject.toml +++ b/templates/pyproject.toml @@ -127,8 +127,11 @@ exclude = [ [tool.pytest.ini_options] # The list of keys vary by repository addopts = ["-ra", "-v", "--strict-config", "--strict-markers", "--doctest-modules"] # This addopts list varies by repository -testpaths = "" # e.g "cf_units" or "lib/iris" +filterwarnings = ["default"] log_level = "INFO" +minversion = "6.0" +testpaths = "" # e.g "cf_units" or "lib/iris" +xfail_strict = "True" [tool.repo-review] # We have agreed that we will permanently ignore the repo-review rules in the first half of this ignore list.