chore(root): bump versioin to 0.3.7

Require django>=6.1 in pyproject, bump ruff/pytest/pytest-django,
point docs at 6.1, drop removed SECURE_BROWSER_XSS_FILTER and
STATICFILES_STORAGE settings. Replace deprecated EMAIL_* settings
with the Django 6.1 MAILERS dict.

.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
         python-version: ["3.13"]
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v4

.github/workflows/dependabot-auto-merge.yml

@@ -19,4 +19,4 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           use-github-auto-merge: true
-          target: minor
+          target: squash

.github/workflows/pre-commit.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
 
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: "3.13"
 

.github/workflows/publish.yml

@@ -11,9 +11,9 @@ jobs:
     permissions:
       id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v7
     - name: Set up Python
-      uses: actions/setup-python@v6
+      uses: actions/setup-python@v7
       with:
         python-version: '3.12'
         cache: 'pip'

.gitignore

@@ -1,8 +1,6 @@
 #--------------------------------------------------#
 # The following was generated by djinit: #
 #--------------------------------------------------#
-AGENTS.md
-
 # Python
 *.py[cod]
 *$py.class

pyproject.toml

@@ -7,7 +7,7 @@ packages = ["src/djinit"]
 
 [project]
 name = "djinitx"
-version = "0.3.5"
+version = "0.3.7"
 description = "A CLI tool to setup Django project"
 readme = "README.md"
 requires-python = ">=3.10"

requirements.txt

@@ -1,5 +1,5 @@
 questionary==2.1.1
 rich==15.0.0
 # dev
-ruff==0.15.14
-pre-commit==4.6.0
+ruff==0.16.6
+pre-commit==4.6.2

setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="djinitx",
-    version="0.3.5",
+    version="0.3.7",
     description="A CLI tool to setup Django projects",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",

src/djinit/creators/files.py

@@ -122,6 +122,7 @@ class FileCreator(BaseService):
             "project_name": self.project_name,
             "api_module": api_module,
             "include_api": True,
+            "use_tailwind": self.metadata.get("use_tailwind", False),
         }
         if comment_out_api:
             urls_context["comment_out_api_url"] = True
@@ -247,6 +248,7 @@ class FileCreator(BaseService):
             "app_names": effective_app_modules,
             "include_apps": True,
             "include_api": True,
+            "use_tailwind": self.metadata.get("use_tailwind", False),
         }
         self._render_and_create_file(
             "urls.py",
@@ -308,7 +310,13 @@ class FileCreator(BaseService):
         CommonUtils.create_file_from_template(
             project_urls_path,
             "config/urls.py-tpl",
-            {"url_type": "project", "project_name": self.project_name, "api_module": "api", "include_api": True},
+            {
+                "url_type": "project",
+                "project_name": self.project_name,
+                "api_module": "api",
+                "include_api": True,
+                "use_tailwind": self.metadata.get("use_tailwind", False),
+            },
             "Updated project urls.py to include API routes",
             should_format=True,
         )

src/djinit/templates/config/asgi.py-tpl

@@ -1,11 +1,13 @@
 """generated with djinit"""
 
 import os
+from pathlib import Path
 import environ
 from django.core.asgi import get_asgi_application
 
+env_path = Path(__file__).resolve().parent.parent / ".env"
 env = environ.Env()
-environ.Env.read_env()
+environ.Env.read_env(env_path)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", env("DJANGO_SETTINGS_MODULE", default="[[ project_name ]].settings.production"))
 application = get_asgi_application()

src/djinit/templates/config/settings/base.py-tpl

@@ -9,14 +9,15 @@ from pathlib import Path
 
 import environ
 
+env_path = Path(__file__).resolve().parent.parent.parent / ".env"
 env = environ.Env()
-environ.Env.read_env()
+environ.Env.read_env(env_path)
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/6.1/howto/deployment/checklist/
 
 
 # Application definition
@@ -82,7 +83,7 @@ WSGI_APPLICATION = "[[ project_name ]].wsgi.application"
 
 
 # Password validation
-# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/6.1/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -101,7 +102,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/5.2/topics/i18n/
+# https://docs.djangoproject.com/en/6.1/topics/i18n/
 
 LANGUAGE_CODE = "en-us"
 TIME_ZONE = "UTC"
@@ -175,7 +176,6 @@ CORS_ALLOW_HEADERS = [
 
 CORS_PREFLIGHT_MAX_AGE = 86400  # 24 hours
 # Security Settings
-SECURE_BROWSER_XSS_FILTER = True
 SECURE_CONTENT_TYPE_NOSNIFF = True
 X_FRAME_OPTIONS = "DENY"
 

src/djinit/templates/config/settings/development.py-tpl

@@ -10,7 +10,7 @@ DEBUG = True
 ALLOWED_HOSTS = ["*"]
 
 # Database
-# https://docs.djangoproject.com/en/5.2/ref/settings/#databases
+# https://docs.djangoproject.com/en/6.1/ref/settings/#databases
 
 DATABASES = {
     "default": {
@@ -30,8 +30,12 @@ DATABASES = {
     }
 }
 
-# Email backend for development
-EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+# Email settings for development
+MAILERS = {
+    "default": {
+        "BACKEND": "django.core.mail.backends.console.EmailBackend",
+    },
+}
 
 # CORS settings for development
 # Allow all origins in development (convenient but not secure)

src/djinit/templates/config/settings/production.py-tpl

@@ -43,14 +43,20 @@ CORS_ALLOW_CREDENTIALS = True
 CORS_ALLOW_PRIVATE_NETWORK = False
 
 # Email settings
-EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = env('EMAIL_HOST', default="smtp.gmail.com")
-EMAIL_PORT = env.int('EMAIL_PORT', default=587)
-EMAIL_USE_TLS = env.bool('EMAIL_USE_TLS', default=True)
-EMAIL_HOST_USER = env('EMAIL_HOST_USER', default="")
-EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD', default="")
-DEFAULT_FROM_EMAIL = env('EMAIL_HOST_USER', default="")
-SERVER_EMAIL = env('EMAIL_HOST_USER', default="")
+MAILERS = {
+    'default': {
+        'BACKEND': 'django.core.mail.backends.smtp.EmailBackend',
+        'OPTIONS': {
+            'host': env('EMAIL_HOST', default='smtp.gmail.com'),
+            'port': env.int('EMAIL_PORT', default=587),
+            'use_tls': env.bool('EMAIL_USE_TLS', default=True),
+            'username': env('EMAIL_HOST_USER', default=''),
+            'password': env('EMAIL_HOST_PASSWORD', default=''),
+        },
+    },
+}
+DEFAULT_FROM_EMAIL = env('EMAIL_HOST_USER', default='')
+SERVER_EMAIL = env('EMAIL_HOST_USER', default='')
 
 # Security settings for production
 SECURE_SSL_REDIRECT = True
@@ -63,9 +69,6 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True
 
-# Static files
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-
 # @IF use_tailwind
 ## Tailwind
 TAILWIND_CLI_VERSION = "4.1.3"  # Pin version

src/djinit/templates/config/urls.py-tpl

@@ -2,12 +2,13 @@
 """generated with djinit"""
 
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, re_path
+from django.conf import settings
+from django.views.static import serve
 # @IF include_api or include_apps
 from django.urls import include
 # @ENDIF
 # @IF include_api
-from django.conf import settings
 from drf_yasg.views import get_schema_view
 from drf_yasg import openapi
 from rest_framework_simplejwt.views import (
@@ -54,6 +55,22 @@ if settings.DEBUG:
         path("schema/", schema_view.with_ui("redoc", cache_timeout=0)),
     ]
 # @ENDIF
+# @IF use_tailwind
+
+# django-browser-reload for tailwind live reload (dev only)
+if settings.DEBUG:
+    urlpatterns += [
+        path("__reload__/", include("django_browser_reload.urls")),
+    ]
+# @ENDIF
+
+urlpatterns += [
+    re_path(
+        r"^media/(?P<path>.*)$",
+        serve,
+        {"document_root": settings.MEDIA_ROOT},
+    ),
+]
 # @ENDIF
 # @IF url_type == 'api_root'
 from django.urls import include, path

src/djinit/templates/config/wsgi.py-tpl

@@ -1,11 +1,13 @@
 """generated with djinit"""
 
 import os
+from pathlib import Path
 import environ
 from django.core.wsgi import get_wsgi_application
 
+env_path = Path(__file__).resolve().parent.parent / ".env"
 env = environ.Env()
-environ.Env.read_env()
+environ.Env.read_env(env_path)
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", env("DJANGO_SETTINGS_MODULE", default="[[ project_name ]].settings.production"))
 

src/djinit/templates/project/manage.py-tpl

@@ -3,15 +3,28 @@
 """generated with djinit"""
 
 """Django's command-line utility for administrative tasks."""
+
 import os
 import sys
+from pathlib import Path
 
 import environ
 
+# Load environment variables from .env
+BASE_DIR = Path(__file__).resolve().parent
+env = environ.Env()
+env.read_env(BASE_DIR / ".env")
+
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", os.getenv("DJANGO_SETTINGS_MODULE", "[[ project_name ]].settings.production"))
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE",
+        env(
+            "DJANGO_SETTINGS_MODULE",
+            default="[[ project_name ]].settings.production",
+        ),
+    )
 
     try:
         from django.core.management import execute_from_command_line
@@ -21,12 +34,9 @@ def main():
             "available on your PYTHONPATH environment variable? Did you "
             "forget to activate a virtual environment?"
         ) from exc
+
     execute_from_command_line(sys.argv)
 
 
 if __name__ == "__main__":
-    env = environ.Env()
-    # Read .env file, if it exists
-    environ.Env.read_env()
-
     main()

src/djinit/templates/project/pyproject.toml-tpl

@@ -1,12 +1,12 @@
 [project]
-name = "[[ package_name ]]"
+name = "[[ project_name ]]"
 version = "0.1.0"
 description = ""
 readme = "README.md"
 requires-python = ">=3.13"
 license = { text = "MIT" }
 dependencies = [
-    "django",
+    "django>=6.1,<7.0",
     "django-environ",
     "django-jazzmin",
     "djangorestframework",
@@ -37,9 +37,9 @@ dependencies = [
 
 [dependency-groups]
 dev = [
-    "ruff>=0.14.2",
-    "pytest>=8.0.0",
-    "pytest-django>=4.9.0",
+    "ruff>=0.16.6",
+    "pytest>=9.1.1",
+    "pytest-django>=4.14.0",
 ]
 
 [tool.ruff]
@@ -62,4 +62,7 @@ ignore = [
 ]
 
 [tool.ruff.lint.isort]
-known-first-party = ["[[ module_name ]]"]
+known-first-party = ["[[ project_name ]]"]
+
+[tool.ruff.lint.per-file-ignores]
+"[[ project_name ]]/settings/*.py" = ["F403", "F405"]

src/djinit/utils/django.py

@@ -65,6 +65,7 @@ class DjangoHelper:
                 "url_type": "project",
                 "project_name": project_name,
                 "django_version": DjangoHelper.DJANGO_VERSION,
+                "use_tailwind": metadata.get("use_tailwind", False),
             }
             project_files = [
                 ("urls.py", "config/urls.py-tpl", urls_context),

uv.lock

@@ -43,7 +43,7 @@ wheels = [
 
 [[package]]
 name = "djinitx"
-version = "0.3.4"
+version = "0.3.7"
 source = { editable = "." }
 dependencies = [
     { name = "questionary" },