From ce5290db84bb19915785896e44a1df464815d9c9 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Mon, 28 Apr 2025 15:18:21 -0400 Subject: [PATCH 1/3] Only add isort or black configuration when selected --- python-project-template/pyproject.toml.jinja | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python-project-template/pyproject.toml.jinja b/python-project-template/pyproject.toml.jinja index 7db20a8..b7b71e3 100644 --- a/python-project-template/pyproject.toml.jinja +++ b/python-project-template/pyproject.toml.jinja @@ -68,13 +68,16 @@ testpaths = [ ] addopts = "--doctest-modules --doctest-glob=*.rst" +{% if 'black' in enforce_style -%} [tool.black] line-length = 110 -target-version = ["py{{ py.min(python_versions) | replace(".", "") }}"] - +target-version = 2 +{% endif -%} +{% if 'isort' in enforce_style -%} [tool.isort] profile = "black" line_length = 110 +{% endif -%} [tool.ruff] line-length = 110 From 93892d7cf46932896a08934fc438671bd7d5c306 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Mon, 28 Apr 2025 15:20:48 -0400 Subject: [PATCH 2/3] Revert test change --- python-project-template/pyproject.toml.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-project-template/pyproject.toml.jinja b/python-project-template/pyproject.toml.jinja index b7b71e3..8b3b635 100644 --- a/python-project-template/pyproject.toml.jinja +++ b/python-project-template/pyproject.toml.jinja @@ -71,7 +71,7 @@ addopts = "--doctest-modules --doctest-glob=*.rst" {% if 'black' in enforce_style -%} [tool.black] line-length = 110 -target-version = 2 +target-version = ["py{{ py.min(python_versions) | replace(".", "") }}"] {% endif -%} {% if 'isort' in enforce_style -%} [tool.isort] From 0c2985274c4dc8189052ee76aebbc094e73ff6b6 Mon Sep 17 00:00:00 2001 From: Sandro Campos Date: Mon, 28 Apr 2025 15:28:20 -0400 Subject: [PATCH 3/3] Add same check for ruff --- python-project-template/pyproject.toml.jinja | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python-project-template/pyproject.toml.jinja b/python-project-template/pyproject.toml.jinja index 8b3b635..b54dc30 100644 --- a/python-project-template/pyproject.toml.jinja +++ b/python-project-template/pyproject.toml.jinja @@ -78,11 +78,12 @@ target-version = ["py{{ py.min(python_versions) | replace(".", "") }}"] profile = "black" line_length = 110 {% endif -%} - +{% if 'ruff_lint' in enforce_style or 'ruff_format' in enforce_style -%} [tool.ruff] line-length = 110 target-version = "py{{ py.min(python_versions) | replace(".", "") }}" - +{% endif -%} +{% if 'ruff_lint' in enforce_style -%} [tool.ruff.lint] select = [ # pycodestyle @@ -114,7 +115,6 @@ select = [ # Numpy v2.0 compatibility "NPY201", ] - ignore = [ "UP006", # Allow non standard library generics in type hints "UP007", # Allow Union in type hints @@ -124,6 +124,7 @@ ignore = [ "UP015", # Allow redundant open parameters "UP028", # Allow yield in for loop ] +{% endif -%} {%- if mypy_type_checking != 'none' %} [tool.setuptools.package-data]