Merge branch 'master' into ebaii-ngs-niveau1-2023-prod

.gitlab-ci.yml

@@ -283,6 +283,7 @@ black:
     before_script:
         - apk add --update --no-cache curl jq
     script:
+        - if [ `curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines?ref=${TARGET_BRANCH}&status=success&private_token=${PRIVATE_TOKEN}"` == "[]" ]; then echo "no prior run on ${TARGET_BRANCH}, good to go."; exit 0; fi
         - TARGET_PIPELINE_ID=`curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines?ref=${TARGET_BRANCH}&status=success&private_token=${PRIVATE_TOKEN}" | jq ".[0].id"`
         - TARGET_COVERAGE=`curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${TARGET_PIPELINE_ID}/jobs?private_token=${PRIVATE_TOKEN}" | jq --arg JOB_NAME "$JOB_NAME" '.[] | select(.name==$JOB_NAME) | .coverage' | cut -d. -f1`
         - CURRENT_COVERAGE=`curl -s "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?private_token=${PRIVATE_TOKEN}" | jq --arg JOB_NAME "$JOB_NAME" '.[] | select(.name==$JOB_NAME) | .coverage' | cut -d. -f1`

chart/values.prod.yaml

 resources:
   limits:
     memory: "2Gi"
-    cpu: "2000m"
+    cpu: "1800m"
 
 admin_email: "strass-admin@pasteur.fr"
 isProd: true

src/strass/requirements.txt

@@ -4,7 +4,7 @@ django-crispy-forms~=2.0
 crispy-bootstrap4
 python-decouple
 --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap/packages/pypi/simple
-django-basetheme-bootstrap>=1.8.2
+django-basetheme-bootstrap>=1.8.4
 --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/hub%2Fdjango-kubernetes-probes/packages/pypi/simple
 django-kubernetes-probes>=1.1
 --extra-index-url https://gitlab.pasteur.fr/api/v4/projects/bbrancot%2Fdjango-basetheme-bootstrap-ebaii-theme/packages/pypi/simple
@@ -24,7 +24,7 @@ pulp
 tblib # needed when running django tests in parallele to get the error when failing
 tqdm
 gunicorn
-qrcode
+qrcode[pil]
 python-magic # to check mime type
 django-csp
 #END OF FILE

src/strass/strass/settings.py

@@ -260,9 +260,7 @@ CSP_IMG_SRC = [
     "data:",
 ]
 CSP_EXCLUDE_URL_PREFIXES = (
-    "/candidate/apply/Information/",
-    "/candidate/edit/Information/",
-    "/setup/settings/import/",
+    # "/candidate/",
 )
 CSP_REPORT_URI = reverse_lazy('cspmailreports:csp-report')
 

src/strass/strass_app/static/js/datatables.url.en.js

-var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/English.json";
\ No newline at end of file
+var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/en-GB.json";
\ No newline at end of file

src/strass/strass_app/static/js/datatables.url.fr.js

-var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/French.json";
\ No newline at end of file
+var datatables_language_url = "https://cdn.datatables.net/plug-ins/1.13.10/i18n/fr-FR.json";
\ No newline at end of file