From 8265291e99058268ef51490275c1871a3d86e8a9 Mon Sep 17 00:00:00 2001 From: "Patrick J. Roddy" Date: Tue, 30 Jan 2024 16:18:41 +0000 Subject: [PATCH] Fix linting the template check (#287) Noticed during my test of issue templates #273, that this was actually not working! This should fail, due to dodgy linting. --------- Co-authored-by: David Stansby --- .github/workflows/linting.yml | 6 ++++-- .pre-commit-config.yaml | 21 +++++++++++++++---- {{cookiecutter.project_slug}}/LICENSE.md | 2 +- {{cookiecutter.project_slug}}/pyproject.toml | 7 ++----- .../{{cookiecutter.package_name}}/__init__.py | 1 + 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 620f057c..dd7f7fe3 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -55,5 +55,7 @@ jobs: run: cookiecutter . --no-input --output-dir cookie-template - name: Run pre-commit - run: pre-commit run --all-files --color always --verbose - working-directory: cookie-template + run: |- + git add . + pre-commit run --all-files --color always --verbose + working-directory: cookie-template/python-template diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6b06cf46..0bcd9716 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,10 @@ repos: - id: ruff args: - --config=pyproject.toml - exclude: "{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}" + exclude: |- + (?x)( + {{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}} + ) - id: ruff-format args: - --config=pyproject.toml @@ -17,7 +20,10 @@ repos: rev: v0.23.1 hooks: - id: toml-sort-fix - exclude: "{{cookiecutter.project_slug}}/pyproject.toml" + exclude: |- + (?x)( + {{cookiecutter.project_slug}}/pyproject.toml + ) - repo: https://github.com/pre-commit/mirrors-mypy rev: v1.8.0 hooks: @@ -26,12 +32,19 @@ repos: - --config-file=pyproject.toml additional_dependencies: - pytest - exclude: "{{cookiecutter.project_slug}}/(src/{{cookiecutter.package_name}}|tests)" + exclude: |- + (?x)( + {{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}| + {{cookiecutter.project_slug}}/tests + ) - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.1.0 hooks: - id: prettier - exclude: "{{cookiecutter.project_slug}}/.github/workflows/tests.yml" + exclude: |- + (?x)( + {{cookiecutter.project_slug}}/.github/workflows/tests.yml + ) - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.5.0 hooks: diff --git a/{{cookiecutter.project_slug}}/LICENSE.md b/{{cookiecutter.project_slug}}/LICENSE.md index 1b2ae425..465f567d 100644 --- a/{{cookiecutter.project_slug}}/LICENSE.md +++ b/{{cookiecutter.project_slug}}/LICENSE.md @@ -649,4 +649,4 @@ what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <>. -{%- endif -%} +{%- endif %} diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml index 5cdecc8b..bb359e8f 100644 --- a/{{cookiecutter.project_slug}}/pyproject.toml +++ b/{{cookiecutter.project_slug}}/pyproject.toml @@ -56,9 +56,6 @@ paths.source = [ [tool.mypy] explicit_package_bases = true -plugins = [ - "numpy.typing.mypy_plugin", -] [tool.pytest.ini_options] addopts = """ @@ -74,7 +71,7 @@ testpaths = [ fix = true force-exclude = true ignore = [ - "COM812", # trailing commas (ruff-format recommended) + "COM812", # trailing commas (ruff-format recommended) "D203", # no-blank-line-before-class "D212", # multi-line-summary-first-line "D407", # removed dashes lines under sections @@ -86,7 +83,7 @@ per-file-ignores = {"tests*" = [ "S101", ]} select = [ - "ALL" + "ALL", ] target-version = "py{{cookiecutter.min_python_version | replace('.', '')}}" isort.known-first-party = [ diff --git a/{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}/__init__.py b/{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}/__init__.py index 3a8d6d5c..e6dfdbd4 100644 --- a/{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}/__init__.py +++ b/{{cookiecutter.project_slug}}/src/{{cookiecutter.package_name}}/__init__.py @@ -1 +1,2 @@ +"""{{cookiecutter.package_name}} package.""" from ._version import __version__ # noqa: F401