[pull] master from cookiecutter:master

.github/contributors.json

@@ -1523,5 +1523,10 @@
     "name": "Paul Wulff",
     "github_login": "mtmpaulwulff",
     "twitter_username": ""
+  },
+  {
+    "name": "Mounir",
+    "github_login": "mounirmesselmeni",
+    "twitter_username": ""
   }
 ]

.github/dependabot.yml

@@ -3,6 +3,22 @@
 
 version: 2
 updates:
+  # Update Python deps for the template (not the generated project)
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "project infrastructure"
+
+  # Update Python deps for the documentation
+  - package-ecosystem: "pip"
+    directory: "docs/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "project infrastructure"
+
   # Update GitHub actions in workflows
   - package-ecosystem: "github-actions"
     directory: "/"

.pyup.yml

@@ -14,8 +14,6 @@ pin: True
 label_prs: update
 
 requirements:
-  - "requirements.txt"
-  - "docs/requirements.txt"
   - "{{cookiecutter.project_slug}}/requirements/base.txt"
   - "{{cookiecutter.project_slug}}/requirements/local.txt"
   - "{{cookiecutter.project_slug}}/requirements/production.txt"

CONTRIBUTORS.md

@@ -1552,6 +1552,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Mounir</td>
+    <td>
+      <a href="https://github.com/mounirmesselmeni">mounirmesselmeni</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>mozillazg</td>
     <td>

{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json

@@ -35,7 +35,7 @@
                     "analysis.typeCheckingMode": "basic",
                     "defaultInterpreterPath": "/usr/local/bin/python",
                     "editor.codeActionsOnSave": {
-                        "source.organizeImports": true
+                        "source.organizeImports": "always"
                     },
                     "editor.defaultFormatter": "charliermarsh.ruff",
                     "languageServer": "Pylance",
@@ -54,8 +54,7 @@
                 // python
                 "ms-python.python",
                 "ms-python.vscode-pylance",
-                "ms-python.isort",
-                "ms-python.black-formatter",
+                "charliermarsh.ruff",
                 // django
                 "batisteo.vscode-django"
             ]

{{cookiecutter.project_slug}}/package.json

@@ -31,7 +31,7 @@
     "webpack": "^5.65.0",
     "webpack-bundle-tracker": "^3.0.1",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.6.0",
+    "webpack-dev-server": "^5.0.2",
     "webpack-merge": "^5.8.0"
   },
   "engines": {

{{cookiecutter.project_slug}}/webpack/dev.config.js

@@ -6,13 +6,16 @@ module.exports = merge(commonConfig, {
   devtool: 'inline-source-map',
   devServer: {
     port: 3000,
-    proxy: {
-      {%- if cookiecutter.use_docker == 'n' %}
-      '/': 'http://0.0.0.0:8000',
-      {%- else %}
-      '/': 'http://django:8000',
-      {%- endif %}
-    },
+    proxy: [
+      {
+        context: ['/'],
+        {%- if cookiecutter.use_docker == 'n' %}
+        target: 'http://0.0.0.0:8000',
+        {%- else %}
+        target: 'http://django:8000',
+        {%- endif %}
+      },
+    ],
     client: {
       overlay: {
         errors: true,

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py

@@ -4,9 +4,9 @@
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import gettext_lazy as _
 
-from {{ cookiecutter.project_slug }}.users.forms import UserAdminChangeForm
-from {{ cookiecutter.project_slug }}.users.forms import UserAdminCreationForm
-from {{ cookiecutter.project_slug }}.users.models import User
+from .forms import UserAdminChangeForm
+from .forms import UserAdminCreationForm
+from .models import User
 
 if settings.DJANGO_ADMIN_FORCE_ALLAUTH:
     # Force the `admin` sign in process to go through the `django-allauth` workflow:

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py

@@ -6,7 +6,7 @@
 {%- endif %}
 from django.utils.translation import gettext_lazy as _
 
-from {{ cookiecutter.project_slug }}.users.models import User
+from .models import User
 
 
 class UserAdminChangeForm(admin_forms.UserChangeForm):

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py

@@ -4,7 +4,7 @@
 from django.contrib.auth.models import UserManager as DjangoUserManager
 
 if TYPE_CHECKING:
-    from {{ cookiecutter.project_slug }}.users.models import User  # noqa: F401
+    from .models import User  # noqa: F401
 
 
 class UserManager(DjangoUserManager["User"]):

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py

@@ -11,7 +11,7 @@
 from django.utils.translation import gettext_lazy as _
 {%- if cookiecutter.username_type == "email" %}
 
-from {{ cookiecutter.project_slug }}.users.managers import UserManager
+from .managers import UserManager
 {%- endif %}
 
 

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py

@@ -1,6 +1,6 @@
 from celery import shared_task
 
-from {{ cookiecutter.project_slug }}.users.models import User
+from .models import User
 
 
 @shared_task()

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py

@@ -1,8 +1,8 @@
 from django.urls import path
 
-from {{ cookiecutter.project_slug }}.users.views import user_detail_view
-from {{ cookiecutter.project_slug }}.users.views import user_redirect_view
-from {{ cookiecutter.project_slug }}.users.views import user_update_view
+from .views import user_detail_view
+from .views import user_redirect_view
+from .views import user_update_view
 
 app_name = "users"
 urlpatterns = [