Fix dependencies for updated heroku stack

.github/workflows/django.yml

@@ -40,7 +40,7 @@ jobs:
           installer-parallel: true
       - name: Install dependencies with Poetry
         run: |
-          poetry install --no-root --with=prod
+          poetry install --no-root
           # add virtual environment to path for future steps
           echo .venv/bin >> $GITHUB_PATH
       - name: Run Tests

.github/workflows/pre-commit.yml

@@ -35,7 +35,7 @@ jobs:
           installer-parallel: true
       - name: Install dependencies with Poetry
         run: |
-          poetry install --no-root --with=prod --no-interaction --no-ansi
+          poetry install --no-root --no-interaction --no-ansi
           # add virtual environment to path for future steps
           echo $(poetry env info --path)/bin >> $GITHUB_PATH
       - name: Install npm dependencies

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
     hooks:
       - id: poetry-check
       - id: poetry-export
-        args: ["-f", "requirements.txt", "-o", "ci/requirements.txt", "--without-hashes", "--with", "prod"]
+        args: ["-f", "requirements.txt", "-o", "ci/requirements.txt", "--without-hashes"]
   # js
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0

Dockerfile.django

@@ -22,7 +22,7 @@ ENV PATH $VIRTUAL_ENV/bin:$PATH
 
 # install python dependencies
 COPY poetry.lock pyproject.toml ./
-RUN poetry install --no-root --with=prod
+RUN poetry install --no-root
 
 # start database
 COPY ./docker-django-entrypoint.sh ./

ci/requirements.txt

@@ -12,7 +12,7 @@ defusedxml==0.7.1 ; python_full_version >= "3.12.4" and python_full_version < "3
 dj-database-url==2.3.0 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 django-csp==3.8 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 django-extensions==3.2.3 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
-django-heroku==0.3.1 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
+django-on-heroku==1.1.2 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 django-postgres-extra==2.0.9rc11 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 django-storages==1.14.5 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 django==5.1.6 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
@@ -38,7 +38,6 @@ pexpect==4.9.0 ; python_full_version >= "3.12.4" and python_full_version < "3.13
 pluggy==1.5.0 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 prompt-toolkit==3.0.50 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 psycopg2-binary==2.9.10 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
-psycopg2==2.9.10 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 ptyprocess==0.7.0 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0" and (sys_platform != "win32" and sys_platform != "emscripten")
 pure-eval==0.2.3 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0"
 pycparser==2.22 ; python_full_version >= "3.12.4" and python_full_version < "3.13.0" and platform_python_implementation != "PyPy"

csm_web/csm_web/settings.py

@@ -317,6 +317,6 @@
     CSP_BLOCK_ALL_MIXED_CONTENT = True
 
     # Heroku setup
-    import django_heroku
+    import django_on_heroku
 
-    django_heroku.settings(locals(), staticfiles=False)
+    django_on_heroku.settings(locals(), staticfiles=False)

pyproject.toml

@@ -38,6 +38,11 @@ ipython = "^8.26.0"
 sentry-sdk = "^2.9.0"
 social-auth-app-django = "^5.4.2"
 
+# prod stack (moved here so Heroku installs them automatically)
+django-on-heroku = "^1.1.2"
+psycopg2-binary = "^2.9.9"
+gunicorn = "^22.0.0"
+
 [tool.poetry.group.dev.dependencies]
 # formatting/linting
 black = "^24.4.2"
@@ -46,17 +51,6 @@ pre-commit = "^3.7.1"
 pylint = "^3.2.5"
 pylint-django = "^2.5.5"
 
-[tool.poetry.group.prod]
-# mark prod as optional; these are not needed during development
-optional = true
-
-[tool.poetry.group.prod.dependencies]
-# django
-django-heroku = "^0.3.1"
-psycopg2-binary = "^2.9.9"
-# heroku
-gunicorn = "^22.0.0"
-
 ### tools ###
 
 [tool.isort]