Merge branch 'eteam' into 'dev'

Support pour ETEAM

See merge request animath/si/plateforme-tfjm!46

.gitlab-ci.yml

@@ -7,7 +7,7 @@ py311:
   image: python:3.11-alpine
   before_script:
     - apk add --no-cache libmagic
-    - apk add --no-cache gettext
+    - apk add --no-cache gettext git  # Useful for django-haystack, remove when the newer versions are in PyPI
     - pip install tox --no-cache-dir
   script: tox -e py311
 
@@ -16,19 +16,10 @@ py312:
   image: python:3.12-alpine
   before_script:
     - apk add --no-cache libmagic
-    - apk add --no-cache gettext
+    - apk add --no-cache gettext git  # Useful for django-haystack, remove when the newer versions are in PyPI
     - pip install tox --no-cache-dir
   script: tox -e py312
 
-py313:
-  stage: test
-  image: python:3.13-alpine
-  before_script:
-    - apk add --no-cache libmagic
-    - apk add --no-cache gettext
-    - pip install tox --no-cache-dir
-  script: tox -e py313
-
 linters:
   stage: quality-assurance
   image: python:3-alpine

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.13-alpine
+FROM python:3.12-alpine
 
 ENV PYTHONUNBUFFERED 1
 ENV DJANGO_ALLOW_ASYNC_UNSAFE 1

registration/api/urls.py

@@ -10,4 +10,4 @@ def register_registration_urls(router, path):
     """
     router.register(path + "/payment", PaymentViewSet)
     router.register(path + "/registration", RegistrationViewSet)
-    router.register(path + "/volunteers", VolunteersViewSet, basename="volunteers")
+    router.register(path + "/volunteers", VolunteersViewSet)

requirements.txt

@@ -1,29 +1,29 @@
-channels[daphne]~=4.1.0
+channels[daphne]~=4.0.0
 channels-redis~=4.2.0
-crispy-bootstrap5~=2024.10
-Django>=5.1.2,<6.0
-django-crispy-forms~=2.3
+crispy-bootstrap5~=2023.10
+Django>=5.0.3,<6.0
+django-crispy-forms~=2.1
 django-extensions~=3.2.3
-django-filter~=24.3
-django-haystack~=3.3.0
-django-mailer~=2.3.2
-django-phonenumber-field~=8.0.0
+django-filter~=23.5
+git+https://github.com/django-haystack/django-haystack.git#v3.3b2
+django-mailer~=2.3.1
+django-phonenumber-field~=7.3.0
 django-pipeline~=3.1.0
 django-polymorphic~=3.1.0
 django-tables2~=2.7.0
-djangorestframework~=3.15.2
+djangorestframework~=3.14.0
 django-rest-polymorphic~=0.1.10
 elasticsearch~=7.17.9
-gspread~=6.1.4
-gunicorn~=23.0.0
+gspread~=6.1.0
+gunicorn~=21.2.0
 odfpy~=1.4.1
-pandas~=2.2.3
-phonenumbers~=8.13.47
-psycopg-binary~=3.2.3
-pypdf~=5.0.1
-ipython~=8.28.0
+pandas~=2.2.1
+phonenumbers~=8.13.27
+psycopg2-binary~=2.9.9
+pypdf~=3.17.4
+ipython~=8.20.0
 python-magic~=0.4.27
-requests~=2.32.3
+requests~=2.31.0
 sympasoap~=1.1
-uvicorn~=0.32.0
-websockets~=13.1
+uvicorn~=0.25.0
+websockets~=12.0

tfjm/context_processors.py

@@ -18,12 +18,11 @@ def tfjm_context(request):
             'ML_MANAGEMENT': settings.ML_MANAGEMENT,
             'PAYMENT_MANAGEMENT': settings.PAYMENT_MANAGEMENT,
             'RECOMMENDED_SOLUTIONS_COUNT': settings.RECOMMENDED_SOLUTIONS_COUNT,
-            'SINGLE_TOURNAMENT': settings.SINGLE_TOURNAMENT,
+            'SINGLE_TOURNAMENT':
+                Tournament.objects.first() if Tournament.objects.exists() and settings.SINGLE_TOURNAMENT else None,
             'HEALTH_SHEET_REQUIRED': settings.HEALTH_SHEET_REQUIRED,
             'VACCINE_SHEET_REQUIRED': settings.VACCINE_SHEET_REQUIRED,
             'MOTIVATION_LETTER_REQUIRED': settings.MOTIVATION_LETTER_REQUIRED,
             'SUGGEST_ANIMATH': settings.SUGGEST_ANIMATH,
-        },
-        'TFJM_TOURNAMENT':
-            Tournament.objects.first() if Tournament.objects.exists() and settings.SINGLE_TOURNAMENT else None,
+        }
     }

tfjm/settings.py

@@ -262,7 +262,7 @@ _db_type = os.getenv('DJANGO_DB_TYPE', 'sqlite').lower()
 if _db_type == 'mysql' or _db_type.startswith('postgres') or _db_type == 'psql':  # pragma: no cover
     DATABASES = {
         'default': {
-            'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql',
+            'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql_psycopg2',
             'NAME': os.environ.get('DJANGO_DB_NAME', 'tfjm'),
             'USER': os.environ.get('DJANGO_DB_USER', 'tfjm'),
             'PASSWORD': os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'),
@@ -355,7 +355,7 @@ if TFJM_APP == "TFJM":
     HAS_FINAL = True
     ML_MANAGEMENT = True
     PAYMENT_MANAGEMENT = True
-    SINGLE_TOURNAMENT = False
+    SINGLE_TOURNAMENT = True
     HEALTH_SHEET_REQUIRED = True
     VACCINE_SHEET_REQUIRED = True
     MOTIVATION_LETTER_REQUIRED = True

tfjm/templates/base.html

@@ -94,7 +94,7 @@
 
 {% javascript 'main' %}
 
-{{ TFJM|json_script:'TFJM_settings' }}
+{{ TFJM|json_script:TFJM_settings }}
 
 <script>
     const CSRF_TOKEN = "{{ csrf_token }}"

tfjm/templates/navbar.html

@@ -18,7 +18,7 @@
             </li>
             <li class="nav-item active">
                 {% if TFJM.SINGLE_TOURNAMENT %}
-                    <a href="{% url 'participation:tournament_detail' pk=TFJM_TOURNAMENT.pk %}" class="nav-link">
+                    <a href="{% url 'participation:tournament_detail' pk=TFJM.SINGLE_TOURNAMENT.pk %}" class="nav-link">
                         <i class="fas fa-calendar-day"></i> {% trans "Tournament" %}
                     </a>
                 {% else %}

tox.ini

@@ -2,7 +2,6 @@
 envlist =
     py311
     py312
-    py313
 
     linters
 skipsdist = True