Merge branch 'main' into bootstrap-sponsors-in-dev

Author: JacobCoffee

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pip-
 
       - name: Install dependencies
-        run: pip install -e '.[dev]'
+        run: pip install --group dev -e .
 
       - name: Check for ungenerated migrations
         run: python manage.py makemigrations --check --dry-run
@@ -82,9 +82,7 @@ jobs:
           restore-keys: ${{ runner.os }}-pip-
 
       - name: Install dependencies
-        run: |
-          pip install -U pip setuptools wheel
-          pip install -e '.[dev]'
+        run: pip install --group dev -e .
 
       - name: Run tests
         run: python -Wd -m coverage run manage.py test -v2

Dockerfile

@@ -39,8 +39,8 @@ COPY pyproject.toml /code/
 RUN --mount=type=cache,target=/root/.cache/pip \
     set -x \
     && pip --disable-pip-version-check \
-        install \
-        '.[dev]'
+        install --group dev \
+        .
 
 COPY . /code/
 

pydotorg/settings/local.py

@@ -25,13 +25,19 @@
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
 
-INSTALLED_APPS += [
-    "debug_toolbar",
-]
-
-MIDDLEWARE += [
-    "debug_toolbar.middleware.DebugToolbarMiddleware",
-]
+try:
+    import debug_toolbar  # noqa: F401
+
+    INSTALLED_APPS += [
+        "debug_toolbar",
+    ]
+
+    MIDDLEWARE += [
+        "debug_toolbar.middleware.DebugToolbarMiddleware",
+    ]
+except ModuleNotFoundError as exc:
+    if exc.name != "debug_toolbar":
+        raise
 
 CACHES = {
     "default": {

pydotorg/urls.py

@@ -73,6 +73,7 @@
 
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-    import debug_toolbar
+    if "debug_toolbar" in settings.INSTALLED_APPS:
+        import debug_toolbar
 
-    urlpatterns = [path("__debug__/", include(debug_toolbar.urls)), *urlpatterns]
+        urlpatterns = [path("__debug__/", include(debug_toolbar.urls)), *urlpatterns]