Port to Django 3

ResEl-TB · Mar 31, 2024 · 3b1e9d5 · 3b1e9d5
1 parent 6094ccc
commit 3b1e9d5
Show file tree

Hide file tree

Showing 87 changed files with 139 additions and 169 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -49,8 +49,7 @@ before_script:
   - echo "CREATE DATABASE ${MYSQL_QOS_DATABASE}" | mysql -u${MYSQL_QOS_USER} -p${MYSQL_QOS_PASSWORD} -h ${MYSQL_QOS_HOST}
   - source .install/scripts/install_openldap.sh
 #  - source .install/scripts/install_latex.sh
-  - pip3 install --upgrade pip
-  - pip3 install -qUr requirements.txt
+  - pip3 install --break-system-packages -qUr requirements.txt
   - rm -f -- ${ROOTDIR}myresel/settings_local.py
   - export MYSQL_USER=root
   - source .install/scripts/configure.sh

diff --git a/.install/etc/ldap/slapd.conf b/.install/etc/ldap/slapd.conf
@@ -50,8 +50,7 @@ loglevel	65535
 
 # Where the dynamically loaded modules are stored
 modulepath	/usr/lib/ldap
-moduleload	back_bdb
-moduleload	back_hdb
+moduleload	back_mdb
 #moduleload	back_ldap
 moduleload	back_monitor
 moduleload	syncprov
@@ -71,7 +70,7 @@ tool-threads 	1
 # Specific Backend Directives for bdb:
 # Backend specific directives apply to this backend until another
 # 'backend' directive occurs
-backend		bdb
+backend		mdb
 
 #######################################################
 ## Configuration relative a la gestion des accesslogs
@@ -96,7 +95,7 @@ backend		bdb
 # Specific Directives for database #1, of type bdb:
 # Database specific directives apply to this databasse until another
 # 'database' directive occurs
-database        bdb
+database        mdb
 
 # The base of your directory in database #1
 suffix          "dc=maisel,dc=enst-bretagne,dc=fr"
@@ -185,9 +184,6 @@ syncprov-sessionlog 100
 # These access lines apply to database #1 only
 mode 0600
 
-cachesize 100000
-#dbcachesize 125829120 # seulement en LDBM
-
 checkpoint 1024 10
 
 # Ensure read access to the base for things like
@@ -208,7 +204,7 @@ checkpoint 1024 10
 #database        <other>
 
 # The backend type, bdb, is the default standard
-database	bdb
+database	mdb
 
 # The base of your directory in database #2
 suffix          "dc=resel,dc=enst-bretagne,dc=fr"
@@ -275,9 +271,6 @@ syncprov-sessionlog 100
 
 mode 0600
 
-cachesize 100000
-#dbcachesize 5242880 seulement en LDBM
-
 checkpoint 1024 10
 
 # Activation du monitoring

diff --git a/.install/scripts/install_essentials.sh b/.install/scripts/install_essentials.sh
@@ -7,5 +7,5 @@ else
     apt-get -qq upgrade
 fi
 
-apt-get -qq install build-essential python3-software-properties python3 python3-dev python3-pip vim libssl-dev libmariadbclient-dev gcc
+apt-get -qq install build-essential python3-software-properties python3 python3-dev python3-pip vim libssl-dev default-libmysqlclient-dev gcc pkg-config
 #easy_install3 -U pip  # Solve debian bug
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:10
+FROM debian:12
 ARG LDAPPASSWD
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -15,8 +15,7 @@ RUN chmod +x install_essentials.sh && ./install_essentials.sh
 RUN apt -qq update && apt -qq upgrade -y
 
 COPY requirements.txt requirements.txt
-RUN pip3 install --upgrade pip
-RUN pip3 install -qr requirements.txt
+RUN pip3 install --break-system-packages -qr requirements.txt
 
 # LDAP
 RUN apt -qq install expect ldap-utils libldap2-dev libsasl2-dev libssl-dev ldapvi -y

diff --git a/campus/forms.py b/campus/forms.py
@@ -8,7 +8,7 @@
 from django.forms import ModelForm, CharField, TextInput, Form, Textarea, ChoiceField,\
                                     EmailField, IntegerField, Select, CheckboxInput, SelectMultiple
 from django.forms.models import ModelMultipleChoiceField
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.db.models import Q
 
 from ldap3.core.exceptions import LDAPException

diff --git a/campus/models/rooms_models.py b/campus/models/rooms_models.py
@@ -1,6 +1,6 @@
 from dateutil.relativedelta import relativedelta
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 

diff --git a/campus/templates/base_campus.html b/campus/templates/base_campus.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 <!DOCTYPE html>

diff --git a/campus/templates/campus/ae-admin/add-admin.html b/campus/templates/campus/ae-admin/add-admin.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 <script type="text/javascript">
 

diff --git a/campus/templates/campus/ae-admin/add-member.html b/campus/templates/campus/ae-admin/add-member.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 <script type="text/javascript">

diff --git a/campus/templates/campus/ae-admin/delete-admin.html b/campus/templates/campus/ae-admin/delete-admin.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 <script type="text/javascript">
 

diff --git a/campus/templates/campus/ae-admin/export-csv.html b/campus/templates/campus/ae-admin/export-csv.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 <script type="text/javascript">

diff --git a/campus/templates/campus/ae-admin/home.html b/campus/templates/campus/ae-admin/home.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}{% trans "Admin AE" %}{% endblock %}

diff --git a/campus/templates/campus/ae-admin/import-csv.html b/campus/templates/campus/ae-admin/import-csv.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 <script type="text/javascript">
 

diff --git a/campus/templates/campus/clubs/detail.html b/campus/templates/campus/clubs/detail.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load clubs_extras %}
 

diff --git a/campus/templates/campus/clubs/list.html b/campus/templates/campus/clubs/list.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 {% load clubs_extras %}
 

diff --git a/campus/templates/campus/clubs/new_club.html b/campus/templates/campus/clubs/new_club.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}Associations et clubs{% endblock %}

diff --git a/campus/templates/campus/home.html b/campus/templates/campus/home.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}Accueil Campus{% endblock %}

diff --git a/campus/templates/campus/mails/display.html b/campus/templates/campus/mails/display.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}{% trans "Mails campus" %}{% endblock %}

diff --git a/campus/templates/campus/mails/need_moderation.html b/campus/templates/campus/mails/need_moderation.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}{% trans "Modération des mails campus" %}{% endblock %}

diff --git a/campus/templates/campus/mails/send_mail.html b/campus/templates/campus/mails/send_mail.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Envoyer un mail{% endblock %}
 

diff --git a/campus/templates/campus/rooms/booking_detail.html b/campus/templates/campus/rooms/booking_detail.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}Événement{% endblock %}

diff --git a/campus/templates/campus/rooms/calendar.html b/campus/templates/campus/rooms/calendar.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rooms_extras %}
 {% load i18n %}
 

diff --git a/campus/templates/campus/rooms/room_form.html b/campus/templates/campus/rooms/room_form.html
@@ -1,5 +1,5 @@
 {% extends "base_campus.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %} {% trans "Ajouter une salle"%} {% endblock %}

diff --git a/campus/templates/campus/rooms/room_management.html b/campus/templates/campus/rooms/room_management.html
@@ -1,6 +1,6 @@
 {% extends "base_campus.html" %}
 {% load rooms_extras %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n%}
 
 {% block title %}{% trans "Gérer les salles" %}{% endblock %}

diff --git a/campus/templates/campus/whoswho/birthdayList.html b/campus/templates/campus/whoswho/birthdayList.html
@@ -1,6 +1,6 @@
 {% extends "base_campus.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans 'Anniversaires' %}{% endblock %}
 

diff --git a/campus/templates/campus/whoswho/searchUsers.html b/campus/templates/campus/whoswho/searchUsers.html
@@ -1,6 +1,6 @@
 {% extends "base_campus.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} Résultat {% endblock %}
 

diff --git a/campus/templates/campus/whoswho/userDetails.html b/campus/templates/campus/whoswho/userDetails.html
@@ -1,6 +1,6 @@
 {% extends "base_campus.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{{display_user.first_name}}{% endblock %}
 

diff --git a/campus/templates/campus/whoswho/userHome.html b/campus/templates/campus/whoswho/userHome.html
@@ -1,6 +1,6 @@
 {% extends "base_campus.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %} WhosWho {% endblock %}
 

diff --git a/campus/views/views_ae_admin.py b/campus/views/views_ae_admin.py
@@ -8,7 +8,7 @@
 from django.contrib.auth.decorators import login_required
 from django.http import Http404, JsonResponse
 from django.shortcuts import render
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ObjectDoesNotExist
 
 from gestion_personnes.models import LdapUser

diff --git a/campus/views/views_clubs.py b/campus/views/views_clubs.py
@@ -16,7 +16,7 @@
 JsonResponse
 from django.shortcuts import render, redirect
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, View
 
 from campus.forms import ClubManagementForm, ClubEditionForm

diff --git a/campus/views/views_mails.py b/campus/views/views_mails.py
@@ -4,7 +4,7 @@
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseRedirect, HttpResponse, Http404
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib import messages
 from django.urls import reverse
 from django.core.mail import EmailMessage

diff --git a/campus/views/views_rooms.py b/campus/views/views_rooms.py
@@ -5,7 +5,7 @@
 
 from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.contrib import messages
 from django.utils import timezone
 from django.contrib.auth.decorators import permission_required, login_required

diff --git a/devices/forms.py b/devices/forms.py
@@ -6,7 +6,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.mail import EmailMessage
 from django.core.mail import mail_admins
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from fonctions import ldap
 from devices.models import LdapDevice

diff --git a/devices/templates/devices/add_device.html b/devices/templates/devices/add_device.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block titre %}{% trans "Ajout de machine" %}{% endblock %}
 
@@ -43,4 +43,4 @@ <h1 class="page-header">{% trans "Ajouter une machine à votre compte" %}</h1>
             $("#waiter").removeClass("hide");
         });
     </script>
-{% endblock %}
+{% endblock %}
diff --git a/devices/templates/devices/list_devices.html b/devices/templates/devices/list_devices.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block titre %}{% trans "Mes machines" %}{% endblock %}
 

diff --git a/devices/views.py b/devices/views.py
@@ -10,7 +10,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.utils.decorators import method_decorator
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView
 from django.views.generic import View, ListView