Merge branch 'SuperCoopBerlin:master' into master

Author: crosspolar

Dockerfile

@@ -3,6 +3,6 @@ ENV PYTHONUNBUFFERED=1
 WORKDIR /app
 COPY . /app
 
-RUN apt update -y && apt install -y libldap2-dev libsasl2-dev gettext postgresql-client-common postgresql-client
+RUN apt update -y && apt install -y libldap2-dev libsasl2-dev gettext postgresql-client-common postgresql-client && rm -rf /var/lib/apt/lists/*
 
 RUN pip install poetry && poetry install && poetry run python manage.py compilemessages

docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   openldap:
     image: "osixia/openldap"

poetry.lock

@@ -6,46 +6,44 @@ authors = ["Leon Handreke <leonh@ndreke.de>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-Django = "~3.2.23"
+Django = "~3.2.25"
 django-ldapdb = {version="^1.5.1", markers="sys_platform=='linux' or sys_platform=='darwin'"}
-django-weasyprint = "^2.2.1"
+django-weasyprint = "^2.3.0"
 django-extensions = "^3.2.3"
-django-bootstrap-datepicker-plus = "^5.0.4"
+django-bootstrap-datepicker-plus = "^5.0.5"
 psycopg2 = "^2.9.9"
-django-tables2 = "^2.6.0"
-django-filter = "^23.3"
-tablib = "^3.5.0"
-django-phonenumber-field = "^7.2.0"
-phonenumbers = "^8.13.25"
-weasyprint = "58"
+django-tables2 = "^2.7.0"
+django-filter = "^23.5"
+tablib = "^3.6.1"
+django-phonenumber-field = "^7.3.0"
+phonenumbers = "^8.13.39"
+weasyprint = "^62.2"
 django-select2 = "^8.1.2"
-django-silk = "^5.0.4"
-gunicorn = "^21.2.0"
+django-silk = "^5.1.0"
+gunicorn = "^22.0.0"
 django-environ = "^0.11.2"
-django-bootstrap5 = "^23.3"
-djangorestframework = "^3.14.0"
-djangorestframework-simplejwt = "^5.3.0"
-django-cors-headers = "^4.3.0"
-celery = "^5.3.5"
-redis = "^5.0.1"
-ipython = "^8.17.2"
+django-bootstrap5 = "^23.4"
+celery = "^5.4.0"
+redis = "^5.0.6"
+ipython = "^8.25.0"
 django-chartjs = "^2.3.0"
-unidecode = "^1.3.7"
+unidecode = "^1.3.8"
 python-barcode = "^0.15.1"
 fabric = "^3.2.2"
 icecream = "^2.1.3"
 djlint = "^1.34.1"
+requests = "^2.32.3"
 
 [tool.poetry.group.dev.dependencies]
-black = "^23.11.0"
-ipython = "^8.17.2"
+black = "^23.12.1"
+ipython = "^8.25.0"
 pre-commit = "^2.21.0"
 werkzeug = "^2.3.8"
-pytest = "^7.4.3"
+pytest = "^7.4.4"
 pytest-cov = "^4.1.0"
-pytest-django = "^4.7.0"
+pytest-django = "^4.8.0"
 pytest-sugar = "^0.9.7"
-selenium = "^4.15.2"
+selenium = "^4.21.0"
 factory-boy = "^3.3.0"
 djlint = "^1.34.1"
 

pyproject.toml

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from tapir.coop.models import ShareOwnership, DraftUser
+from tapir.coop.models import ShareOwnership, DraftUser, MembershipResignation
 
 admin.site.register(ShareOwnership)
 admin.site.register(DraftUser)
+admin.site.register(MembershipResignation)

tapir/api/README.md

@@ -73,9 +73,19 @@ def register_emails():
         from tapir.coop.emails.co_purchaser_updated_mail import (
             CoPurchaserUpdatedMail,
         )
+        from tapir.coop.emails.membershipresignation_confirmation_email import (
+            MembershipResignationConfirmation,
+        )
+        from tapir.coop.emails.membershipresignation_transferred_shares_confirmation import (
+            MembershipResignationTransferredSharesConfirmation,
+        )
 
         TapirEmailBase.register_email(ExtraSharesConfirmationEmail)
         TapirEmailBase.register_email(MembershipConfirmationForActiveMemberEmail)
         TapirEmailBase.register_email(MembershipConfirmationForInvestingMemberEmail)
         TapirEmailBase.register_email(TapirAccountCreatedEmail)
         TapirEmailBase.register_email(CoPurchaserUpdatedMail)
+        TapirEmailBase.register_email(MembershipResignationConfirmation)
+        TapirEmailBase.register_email(
+            MembershipResignationTransferredSharesConfirmation
+        )

tapir/api/__init__.py

@@ -12,3 +12,5 @@
 get_ids_of_users_registered_to_a_shift_with_capability = []
 
 URL_MEMBER_MANUAL = "https://wiki.supercoop.de/wiki/Member_Manual"
+
+feature_flag_membership_resignation = "feature_flags.coop.membership_resignation"