Merge remote-tracking branch 'upstream/main'

{{ cookiecutter.project_name }}/.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
           - "--application-directories={{ cookiecutter.project_name }}"
 
   - repo: https://github.com/Riverside-Healthcare/djLint
-    rev: v1.34.1
+    rev: v1.35.2
     hooks:
       - id: djlint-reformat-django
       - id: djlint-django

{{ cookiecutter.project_name }}/justfile

@@ -90,6 +90,10 @@ coverage-report: test
 @server ADDRESS="":
     just falco work {{ ADDRESS }}
 
+# Kill the django development server in case the process is running in the background
+@kill-server PORT="8000":
+    lsof -i :{{ PORT }} -sTCP:LISTEN -t | xargs -t kill
+
 # Open a Django shell using django-extensions shell_plus command
 @shell:
     just dj shell_plus
@@ -160,7 +164,8 @@ docs-upgrade:
 
 # Bump project version and update changelog
 bumpver VERSION:
-    #!/usr/bin/env sh
+    #!/usr/bin/env bash
+    set -euo pipefail
     just run bump-my-version bump {{ VERSION }}
     just run git-cliff --output CHANGELOG.md
 
@@ -178,15 +183,16 @@ bumpver VERSION:
 
 # Build a wheel distribution of the project using hatch
 build-wheel:
-    #!/usr/bin/env sh
+    #!/usr/bin/env bash
+    set -euo pipefail
     export DEBUG="False"
     just dj collectstatic --no-input --skip-checks
     just dj compress
     hatch build
 
 # Build a binary distribution of the project using hatch / pyapp
 build-bin:
-    #!/usr/bin/env sh
+    #!/usr/bin/env bash
     current_version=$(hatch version)
     wheel_path="${PWD}/dist/{% endraw %}{{ cookiecutter.project_name }}{% raw %}-${current_version}-py3-none-any.whl"
     [ -f "$wheel_path" ] || { echo "Wheel file does not exist. Please build the wheel first using the 'buildwheel' recipe."; exit 1; }

{{ cookiecutter.project_name }}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
 ]
 dependencies = [
   "django[argon2]",
-  "django-allauth",
+  "django-allauth[socialaccount]",
   "django-anymail[amazon-ses]",
   "django-storages[s3]",
   "django-bootstrap5",