diff --git a/.gitignore b/.gitignore index e4c6619..b77da25 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ lib64 src/plone_code_analysis.egg-info src/build /pyvenv.cfg +.flakeheaven_cache diff --git a/docker-entrypoint.py b/docker-entrypoint.py index 358da6c..f1cb070 100755 --- a/docker-entrypoint.py +++ b/docker-entrypoint.py @@ -10,7 +10,6 @@ import os import sys - ACTIONS = { "check": run_checks, "format": run_formatters, diff --git a/pyproject.toml b/pyproject.toml index f47b7fd..52de5d3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,6 @@ include = '\.pyi?$' profile = "black" force_alphabetical_sort = true force_single_line = true -lines_after_imports = 2 line_length = 120 [tool.flakeheaven] diff --git a/requirements.txt b/requirements.txt index 034242e..b5606e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ src/ -black==25.1.0 +black==26.3.1 flake8-blind-except==0.2.1 flake8-debugger==4.1.2 flake8-print==5.0.0 flakeheaven==3.3.0 -isort==6.0.1 -pyroma==4.2 -tomli==2.2.1 -zpretty==3.1.0 +isort==8.0.1 +pyroma==5.0.1 +tomli==2.4.1 +zpretty==4.0.0 diff --git a/src/plone_code_analysis/check.py b/src/plone_code_analysis/check.py index 2bab217..7a6b738 100644 --- a/src/plone_code_analysis/check.py +++ b/src/plone_code_analysis/check.py @@ -4,7 +4,6 @@ from plone_code_analysis.logger import logger from plone_code_analysis.settings import checks_from_settings - CHECKS = { "black": [ run_command, diff --git a/src/plone_code_analysis/format.py b/src/plone_code_analysis/format.py index 87f76e1..029b7c8 100644 --- a/src/plone_code_analysis/format.py +++ b/src/plone_code_analysis/format.py @@ -4,7 +4,6 @@ from plone_code_analysis.logger import logger from plone_code_analysis.settings import formatters_from_settings - FORMATTERS = { "isort": [ run_command, diff --git a/src/plone_code_analysis/logger.py b/src/plone_code_analysis/logger.py index 1be7e2f..1620053 100644 --- a/src/plone_code_analysis/logger.py +++ b/src/plone_code_analysis/logger.py @@ -2,7 +2,6 @@ import os import re - LOG_LEVEL = { "INFO": logging.INFO, "DEBUG": logging.DEBUG, diff --git a/src/plone_code_analysis/settings.py b/src/plone_code_analysis/settings.py index 84629e9..0f74408 100644 --- a/src/plone_code_analysis/settings.py +++ b/src/plone_code_analysis/settings.py @@ -5,7 +5,6 @@ import tomli - SECTION = "tool.plone-code-analysis" diff --git a/src/setup.py b/src/setup.py index 49acec7..5bfce1c 100644 --- a/src/setup.py +++ b/src/setup.py @@ -1,8 +1,8 @@ """Installer for the plone_code_analysis package.""" + from pathlib import Path from setuptools import setup - long_description = Path("README.md").read_text() diff --git a/tests/conftest.py b/tests/conftest.py index 1e0fc7b..a2c4822 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ """Pytest configuration.""" + from pathlib import Path import os diff --git a/tests/fixtures/configs/foo/__init__.py b/tests/fixtures/configs/foo/__init__.py index c0a7f9e..d769500 100644 --- a/tests/fixtures/configs/foo/__init__.py +++ b/tests/fixtures/configs/foo/__init__.py @@ -1,5 +1,5 @@ """Foo package""" -import logging +import logging logger = logging.getLogger("logger") diff --git a/tests/fixtures/configs/setup.py b/tests/fixtures/configs/setup.py index 281a648..8b07b7c 100644 --- a/tests/fixtures/configs/setup.py +++ b/tests/fixtures/configs/setup.py @@ -1,6 +1,6 @@ """Installer for the foo package.""" -from setuptools import setup +from setuptools import setup setup( name="foo", diff --git a/tests/fixtures/packages/not_ok/pyproject.toml b/tests/fixtures/packages/not_ok/pyproject.toml index 1001596..25cf921 100644 --- a/tests/fixtures/packages/not_ok/pyproject.toml +++ b/tests/fixtures/packages/not_ok/pyproject.toml @@ -7,7 +7,6 @@ include = '\.pyi?$' profile = "black" force_alphabetical_sort = true force_single_line = true -lines_after_imports = 2 line_length = 120 [tool.flakeheaven] diff --git a/tests/fixtures/packages/ok/foo/__init__.py b/tests/fixtures/packages/ok/foo/__init__.py index 5a17c7b..d769500 100644 --- a/tests/fixtures/packages/ok/foo/__init__.py +++ b/tests/fixtures/packages/ok/foo/__init__.py @@ -2,5 +2,4 @@ import logging - logger = logging.getLogger("logger") diff --git a/tests/fixtures/packages/ok/pyproject.toml b/tests/fixtures/packages/ok/pyproject.toml index 1001596..25cf921 100644 --- a/tests/fixtures/packages/ok/pyproject.toml +++ b/tests/fixtures/packages/ok/pyproject.toml @@ -7,7 +7,6 @@ include = '\.pyi?$' profile = "black" force_alphabetical_sort = true force_single_line = true -lines_after_imports = 2 line_length = 120 [tool.flakeheaven] diff --git a/tests/fixtures/packages/ok/setup.py b/tests/fixtures/packages/ok/setup.py index 862f309..b8fc8df 100644 --- a/tests/fixtures/packages/ok/setup.py +++ b/tests/fixtures/packages/ok/setup.py @@ -3,7 +3,6 @@ from pathlib import Path from setuptools import setup - long_description = f""" {Path("README.md").read_text()}\n """ diff --git a/tests/package/test_check.py b/tests/package/test_check.py index df05165..77c4be1 100644 --- a/tests/package/test_check.py +++ b/tests/package/test_check.py @@ -1,4 +1,5 @@ """Test plone_code_analysis.settings.""" + from pathlib import Path from plone_code_analysis import check from plone_code_analysis import settings @@ -6,7 +7,6 @@ import os import pytest - PCK_OK = Path("tests/fixtures/packages/ok").resolve() PCK_NOK = Path("tests/fixtures/packages/not_ok").resolve() diff --git a/tests/package/test_settings.py b/tests/package/test_settings.py index 1f3687c..7667556 100644 --- a/tests/package/test_settings.py +++ b/tests/package/test_settings.py @@ -1,10 +1,10 @@ """Test plone_code_analysis.settings.""" + from pathlib import Path from plone_code_analysis import settings import pytest - CONFIGS_PATH = Path("tests/fixtures/configs").resolve()