deps: improve requirements

- update setuptools and wheel in Dockerfile
- add hashes to requirements
- move ipython to main requirements for getting a better
  production shell
- move production requirements to main requirements
- add pip-tools to development requirements
- use psycopg2 instead of psycop2-binary

Refs: PT-1952

Author: charn

Dockerfile

@@ -14,13 +14,12 @@ RUN mkdir /entrypoint
 # see .dockerignore for info on what is not copied here:
 COPY --chown=root:root --chmod=755 . /app/
 
-RUN yum update -y && yum install -y \
-    nc \
-    && pip install -U pip \
+RUN dnf update -y  \
+    && dnf install -y nmap-ncat  \
+    && pip install --upgrade pip setuptools wheel \
     && pip install --no-cache-dir -r /app/requirements.txt \
-    && pip install --no-cache-dir  -r /app/requirements-prod.txt \
     && uwsgi --build-plugin https://github.com/City-of-Helsinki/uwsgi-sentry \
-    && yum clean all
+    && dnf clean all
 
 COPY --chown=root:root --chmod=755 docker-entrypoint.sh /entrypoint/docker-entrypoint.sh
 ENTRYPOINT ["/entrypoint/docker-entrypoint.sh"]

pyproject.toml

@@ -18,6 +18,11 @@ extend-select = [
     "W",   # Enable pycodestyle warning (W) rules
 ]
 
+[tool.pip-tools.compile]
+allow-unsafe = true
+generate-hashes = true
+strip-extras = true
+
 [tool.ruff.lint.isort]
 # isort options for ruff:
 # https://docs.astral.sh/ruff/settings/#lintisort

requirements-dev.in

@@ -1,9 +1,9 @@
 -c requirements.txt
 cryptography
 freezegun
-ipython
 parameterized
 pre-commit
+pip-tools
 pytest
 pytest-cov
 pytest-django

requirements-dev.txt

@@ -21,9 +21,12 @@ graphene-django
 graphene-file-upload
 helsinki-profile-gdpr-api
 importlib_metadata
-psycopg2-binary
+ipython
+psycopg2
 requests
 sentry-sdk
 social-auth-app-django
 urllib3
-django-auditlog-extra@git+https://github.com/City-of-Helsinki/django-auditlog-extra.git@bff5fa3921d6821bebdd6be6c9fd20db39d32d54#egg=django-auditlog-extra
+django-auditlog-extra@https://github.com/City-of-Helsinki/django-auditlog-extra/archive/bff5fa3921d6821bebdd6be6c9fd20db39d32d54.zip
+uwsgi
+uwsgitop