Merge branch 'main' into jmad_upgrade_to_2_6_22

.circleci/config.yml

@@ -4,12 +4,12 @@
 #
 version: "2.1"
 orbs:
-  browser-tools: circleci/browser-tools@1.2.4
+  browser-tools: circleci/browser-tools@1.4.8
 
 parameters:
   python-img-tag:
     type: string
-    default: "3.11.4-browsers"
+    default: "3.11.10-browsers"
   db-img-tag:
     type: string
     default: "12.12"
@@ -18,7 +18,7 @@ parameters:
     default: "~/repo"
   cache-version:
     type: string
-    default: "v4-dependencies"
+    default: "v5-dependencies"
 
 executors:
   testbed:
@@ -81,18 +81,11 @@ jobs:
           keys:
             - << pipeline.parameters.cache-version >>-{{ checksum "Pipfile.lock" }}
 
-      - run:
-          name: check Django missing migrations
-          command: |
-            . /tmp/venv/bin/activate
-            ./manage.py makemigrations --no-input --dry-run --check
       - run:
           name: run linting
           command: |
             . /tmp/venv/bin/activate
-            black --check .
-            flake8
-            isort . --check
+            pre-commit run --from-ref=main --to-ref=HEAD
   test:
     executor: testbed
     parallelism: 8

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+
+[*.py]
+indent_size = 4
+
+[{*.js,*.html}]
+indent_style = space
+indent_size = 2

.env.example

@@ -7,12 +7,8 @@ SSL=1
 TEST="Everything is awesome"
 APP_SECRET=this-is-a-very-secret-value
 
-DATABASE_NAME=aidants_connect
-DATABASE_USER=aidants_connect_team
-DATABASE_PASSWORD=""
-DATABASE_HOST=""
-DATABASE_PORT=""
-# Can be replaced by a POSTGRES_URL (from https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING)
+# Replace `<user>` and `<password>` on password-protected DB
+DATABASE_URL=postgres://<user>:<password>@localhost:5432/aidants_connect
 
 # These envars come from the public FranceConnect documentation : https://partenaires.franceconnect.gouv.fr/fcp/fournisseur-service
 FC_AS_FS_BASE_URL=https://fcp.integ01.dev-franceconnect.fr/api/v1
@@ -100,4 +96,4 @@ MATOMO_INSTANCE_SITE_ID=
 SANDBOX_URL="https://sandbox.aidantsconnect.beta.gouv.fr"
 WEBINAIRE_SUBFORM_URL=https://forms.sbc08.com/62bd636aec51457dee5c1167/iDPz-wQRRryM0FZseYXtpA/CYwNkaKIT0iJvW7fkcgmlA/form.html
 SANDBOX_API_URL="https://sandbox.aidantsconnect.beta.gouv.fr/create_aidant"
-SANDBOX_API_TOKEN="TOKEN"
+SANDBOX_API_TOKEN="TOKEN"

.pre-commit-config.yaml

@@ -9,11 +9,11 @@ repos:
       language: system
       pass_filenames: false
   - repo: https://github.com/psf/black
-    rev: 24.4.2
+    rev: 24.8.0
     hooks:
     - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
     - id: flake8
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -24,3 +24,7 @@ repos:
     rev: 5.13.2
     hooks:
     - id: isort
+  - repo: https://github.com/adamchainz/djade-pre-commit
+    rev: 1.1.1
+    hooks:
+    - id: djade

Pipfile

@@ -7,42 +7,44 @@ name = "pypi"
 python_version = "3.11"
 
 [packages]
+api-insee = "1.5"
 celery = {version = "==5.4.0", extras = ["redis"]}
-django = "~=4.2.11"
+django = "~=4.2.16"
+dj-database-url = "~=2.2"
 djangorestframework = "~=3.15"
-django-blocklist = "==2.3.2"
+django-blocklist = "==2.6"
 django-celery-beat = "==2.6.0"
 django-csp = "==3.8"
 django-dsfr = "~=1.0"
 django-extensions = "~=3.2.1"
-django-import-export = "~=4.0"
+django-import-export = {version =  "~=4.0", extras = ["all"]}
 django-ipware = "~=7.0.1"
 django-js-reverse = "~=0.10.0"
 django-magicauth = "==1.0.2"
-django-nested-admin = "~=4.0.2"
+django-nested-admin = "~=4.0"
 django-otp = "~=1.5"
-django-phonenumber-field = {version = "~=7.0", extras = ["phonenumberslite"]}
+django-pgtrigger = "~=4.11.0"
+django-phonenumber-field = {version = "~=8.0", extras = ["phonenumberslite"]}
 django-referrer-policy = "==1.0"
 django-reverse-admin = "==2.9.6"
 gunicorn = "==22.0.0"
 markdown = "~=3.5"
 metabasepy = "==1.12.0"
 mjml-python = "~=1.3"
-pillow = "~=10.3.0"
+pillow = "~=10.3"
 psycopg2-binary = "==2.9.9"
 ptpython = ">=3,<4"
-pydantic = "~=1.10"
-pyjwt = "~=2.8.0"
+pydantic = "~=2.8"
+pyjwt = "~=2.9.0"
 python-dateutil = "~=2.8.2"
 python-dotenv = "~=1.0"
 qrcode = "==7.4.2"
 requests = "~=2.31"
-sentry-sdk = "~=1.32.0"
+sentry-sdk = "~=2.8.0"
 whitenoise = "~=6.2"
 grist-api = "0.1.0"
 ua-parser = "==0.18.0"
 sortedcontainers = "~=2.4.0"
-django-pgtrigger = "~=4.11.0"
 
 [dev-packages]
 pipenv = "*"
@@ -53,8 +55,3 @@ freezegun = "~=1.2"
 pre-commit = "~=3.1"
 selenium = "~=4.4"
 tblib = "*"
-# pre-commit dependencies
-black = "==24.4.2"
-flake8 = "==7.0.0"
-pre-commit-hooks = "==4.6.0"
-isort = "==5.13.2"