Updated libraries.

Author: joeribekker

Dockerfile

@@ -53,7 +53,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
 RUN pip install pip -U
 
 WORKDIR /app
-COPY ./cache /app/cache
+# COPY ./cache /app/cache
 COPY ./bin/docker_start.sh /start.sh
 COPY ./bin/wait_for_db.sh /wait_for_db.sh
 COPY ./bin/celery_worker.sh /celery_worker.sh
@@ -73,7 +73,6 @@ COPY --from=frontend-build /app/src/openklant/static/css /app/src/openklant/stat
 COPY --from=frontend-build /app/src/openklant/static/js /app/src/openklant/static/js
 
 # Stage 3.2 - Copy source code
-COPY ./config /app/config
 COPY ./src /app/src
 
 RUN groupadd -g 1000 openklant \
@@ -103,8 +102,8 @@ LABEL org.label-schema.vcs-ref=$COMMIT_HASH \
 # * warm_cache -> writes to the filesystem cache so that orgs don't need to open the
 #   firewall to github
 RUN python src/manage.py collectstatic --noinput \
-    && python src/manage.py compilemessages \
-    && python src/manage.py warm_cache
+    && python src/manage.py compilemessages
+    # && python src/manage.py warm_cache
 
 EXPOSE 8000
 CMD ["/start.sh"]

bin/compile_dependencies.sh

@@ -23,25 +23,22 @@ export CUSTOM_COMPILE_COMMAND="./bin/compile_dependencies.sh"
 # Base (& prod) deps
 pip-compile \
     --no-emit-index-url \
-    --allow-unsafe \
     "$@" \
     requirements/base.in
 
 # Dependencies for testing
 pip-compile \
     --no-emit-index-url \
     --output-file requirements/ci.txt \
-    --allow-unsafe \
     "$@" \
     requirements/base.txt \
     requirements/test-tools.in \
     requirements/docs.in
 
-# Dev dependencies - exact same set as CI + some extra tooling
+# Dev depedencies - exact same set as CI + some extra tooling
 pip-compile \
     --no-emit-index-url \
     --output-file requirements/dev.txt \
-    --allow-unsafe \
     "$@" \
     requirements/ci.txt \
-    requirements/dev.in
+    requirements/dev.in

requirements/base.in

@@ -1,40 +1,53 @@
 # Core python libraries
-psycopg2  # database driver
-pytz  # handle timezones
+celery
+click<8.1.0  # click>=8.1.0 causes issues with black https://github.com/psf/black/issues/2964
+jq
+jsonschema
+dictdiffer # Used to show diffs for audittrails in admin
+markdown  # used to render some markdown in code to html
+psycopg2
+python-dateutil
 python-dotenv  # environment variables for secrets
 python-decouple  # processing of envvar configs
+requests
+requests-cache
+zgw-consumers
+self-certifi
+bleach
 
 # Framework libraries
-django~=4.1.0
-django-admin-index
+django~=3.2.23
 django-axes
-django-better-admin-arrayfield
-django-choices
 django-cors-headers
-django-cors-middleware
-django-filter
+django-db-logger
+django-extra-views
+django-log-outgoing-requests
+django-loose-fk
 django-markup
 django-redis
-django-rosetta
-django-sniplates
+django-privates
+django-relativedelta
 mozilla-django-oidc-db
-# maykin-django-two-factor-auth
-# phonenumbers
-
-# API libraries
-djangorestframework
-# django-extra-fields
-# django-filter
-# drf-yasg  # api documentation
 
-commonground-api-common==1.11.0
-gemma-zds-client
-zgw-consumers
+# Admin and UI libraries
+django-admin-index
+django-sniplates
+django-better-admin-arrayfield
 
-# task queue
-celery
+# API libraries
+djangorestframework~=3.12.0
+drf-extra-fields
+django-filter
+djangorestframework-camel-case~=1.2.0
+drf-yasg
+drf-writable-nested
+commonground-api-common
+notifications-api-common
+humanize
+djangorestframework-inclusions
 
 # WSGI servers & monitoring - production oriented
 uwsgi
-sentry-sdk  # error monitoring
-elastic-apm  # Elastic APM integration
+sentry_sdk # error monitoring sentry
+flower # task monitoring
+elastic-apm  # Elastic APM integration