From ea8bcd912b67eb9b43fd3f9dd989a0bae1a867cf Mon Sep 17 00:00:00 2001 From: David Slusser Date: Thu, 13 Nov 2025 21:05:42 -0800 Subject: [PATCH 1/4] adding dependency check workflow --- .github/workflows/fawltydeps.yaml | 17 +++++++++++++ pyproject.toml | 39 ++++++++++++++++++++++++++++- src/django_project/core/settings.py | 1 - 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/fawltydeps.yaml diff --git a/.github/workflows/fawltydeps.yaml b/.github/workflows/fawltydeps.yaml new file mode 100644 index 0000000..65051b2 --- /dev/null +++ b/.github/workflows/fawltydeps.yaml @@ -0,0 +1,17 @@ +on: [push] + +jobs: + fawltydeps: + runs-on: ubuntu-latest + name: "fawltydeps" + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: "3.11" + - name: Install dependencies + run: | + pip install fawltydeps + - name: Run fawltydeps + run: | + fawltydeps src/django_project diff --git a/pyproject.toml b/pyproject.toml index 0e82acc..68c97d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,6 @@ dependencies = [ "psycopg2-binary", "redis", "requests>=2.26.0", - "pillow", "playwright", "whitenoise", ] @@ -35,6 +34,7 @@ dev = [ "coveralls", "django-debug-toolbar", "faker", + "fawltydeps", "isort", "model-bakery", "mypy", @@ -118,6 +118,43 @@ exclude = [ ] +[tool.fawltydeps] +code = ["src/django_project"] +deps = ["pyproject.toml"] +ignore_unused = [ + "bandit", + "black", + "coveralls", + "django-braces", + "django-celery-beat", + "django-debug-toolbar", + "django-extensions", + "django-filter", + "gunicorn", + "faker", + "fawltydeps", + "flower", + "isort", + "model-bakery", + "mypy", + "mypy-extensions", + "ruff", + "pillow", + "psycopg2-binary", + "pytest", + "pytest-cov", + "pytest-django", + "radon", + "redis", + "safety", + "types-python-dateutil", + "types-requests", + "typing_extensions", + "whitenoise" + ] +output_format = "human_detailed" + + [tool.setuptools.packages.find] where = ["."] include = ["src/django_project"] diff --git a/src/django_project/core/settings.py b/src/django_project/core/settings.py index 6aa1496..551472d 100644 --- a/src/django_project/core/settings.py +++ b/src/django_project/core/settings.py @@ -55,7 +55,6 @@ # third party apps "django_celery_beat", "django_extensions", - "django_filters", "handyhelpers", # project apps "web", From a51eb22ed8c9e1c632a506d88c46d4c643acd26b Mon Sep 17 00:00:00 2001 From: David Slusser Date: Thu, 13 Nov 2025 21:08:43 -0800 Subject: [PATCH 2/4] adding dependency check workflow --- .github/hooks/pre-commit | 2 +- .github/workflows/fawltydeps.yaml | 2 +- pyproject.toml | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/hooks/pre-commit b/.github/hooks/pre-commit index bbfae50..b3765b8 100755 --- a/.github/hooks/pre-commit +++ b/.github/hooks/pre-commit @@ -24,7 +24,7 @@ function run_checks { } # add pre-commit commands here -run_checks "bandit" bandit src -c pyproject.toml -r +run_checks "bandit" bandit pyproject.toml -r run_checks "isort" isort src --check run_checks "mypy" mypy src run_checks "ruff check" ruff check src diff --git a/.github/workflows/fawltydeps.yaml b/.github/workflows/fawltydeps.yaml index 65051b2..c6cb145 100644 --- a/.github/workflows/fawltydeps.yaml +++ b/.github/workflows/fawltydeps.yaml @@ -11,7 +11,7 @@ jobs: python-version: "3.11" - name: Install dependencies run: | - pip install fawltydeps + pip install -e .[dev] - name: Run fawltydeps run: | fawltydeps src/django_project diff --git a/pyproject.toml b/pyproject.toml index 68c97d4..0992fbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ docker = [ [tool.bandit] exclude_dirs = [ "venv", - "src/django_project/local_test", + "src/local_test", "src/django_project/tests", "src/django_project/*/management/commands", "src/django_project/*/scripts/*" @@ -70,6 +70,7 @@ line-length = 120 [tool.coverage.report] show_missing = true omit = [ + "src/local_test/*", "src/django_project/manage.py", "src/django_project/core/asgi.py", "src/django_project/core/wsgi.py", @@ -91,7 +92,7 @@ profile = "black" [tool.mypy] exclude = [ "venv/*", - "src/django_project/local_test", + "src/local_test", "src/django_project/.*/migrations/.*", "src/django_project/.*/scripts/.*", ] @@ -114,7 +115,7 @@ exclude = [ "src/django_project/tests", "src/django_project/*/migrations", "src/django_project/*/scripts", - "src/django_project/*/local_test" + "src/local_test" ] From 7c7f6d696a58771208464bfb281d8c05cc29ee6f Mon Sep 17 00:00:00 2001 From: David Slusser Date: Thu, 13 Nov 2025 21:11:09 -0800 Subject: [PATCH 3/4] adding dependency check workflow --- .github/workflows/fawltydeps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fawltydeps.yaml b/.github/workflows/fawltydeps.yaml index c6cb145..59bf53b 100644 --- a/.github/workflows/fawltydeps.yaml +++ b/.github/workflows/fawltydeps.yaml @@ -14,4 +14,4 @@ jobs: pip install -e .[dev] - name: Run fawltydeps run: | - fawltydeps src/django_project + fawltydeps From 9ac429c75126411b67aec659fc63b2473bb9c98d Mon Sep 17 00:00:00 2001 From: David Slusser Date: Thu, 13 Nov 2025 21:21:04 -0800 Subject: [PATCH 4/4] adding pytest and fawltydeps badges to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 22da9cd..58bf8a1 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,10 @@ https://spokanetech.github.io/blog/building-spokane-tech/intro/ | Workflow | Description | Status | |----------|-------------------------|------------------------------------------------------------------------------| |Bandit|security checks|![Bandit](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/bandit.yaml/badge.svg)| +|FawltyDeps|dependency checks|![FawltyDeps](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/fawltydeps.yaml/badge.svg)| |Isort|python import ordering|![Isort](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/isort.yaml/badge.svg)| |Mypy|static type checking|![Mypy](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/mypy.yaml/badge.svg)| +|PyTest|unittest execution|![Pytest](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/pytest.yaml/badge.svg)| |Radon|code complexity analysis|![Radon](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/radon.yaml/badge.svg)| |Ruff Format|code formatting|![Format](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/ruff_format.yaml/badge.svg)| |Ruff Lint|static code analysis|![Lint](https://github.com/SpokaneTech/SpokaneTechWeb/actions/workflows/ruff_lint.yaml/badge.svg)|