Dsfr v1.11.2 (#111)

* Update DSFR version

* Update DSFR version

* Update list of components

* Renamed 'tags' to 'components' to avoid confusion with the tag component

* Renamed 'tags' to 'components' to avoid confusion with the tag component

* Update version number

* Fix issue

* Fix minor issues

* Add CI for Django 5

* Add view tests

* test django5 with python 3.10/3.11 only

* test django5 with python 3.10/3.11 only

* Update CI

* Update CI

* there was an attempt

* bourrin

* Update component examples

* Update README

.github/workflows/django-3-10.yml

@@ -0,0 +1,39 @@
+name: Django-DSFR CI for python 3.10 and 3.11
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ["3.10", "3.11"]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: 🐍 Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: 👷 Install Dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install poetry
+        poetry install
+    - name: 🧪 Run Tests - Django 3
+      run: |
+        poetry run python manage.py test
+    - name: 🧪 Run Tests - Django 4
+      run: |
+        poetry add django@^4.1
+        poetry run python manage.py test
+    - name: 🧪 Run Tests - Django 5
+      run: |
+        sed -i 's/python = "^3.8"/python = "^3.10"/g' pyproject.toml
+        poetry add django@^5.0
+        poetry run python manage.py test

.github/workflows/django.yml → .github/workflows/django-3-8.yml

@@ -1,4 +1,4 @@
-name: Django-DSFR CI
+name: Django-DSFR CI for Python 3.8 and 3.9
 
 on:
   push:
@@ -8,12 +8,11 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2

Makefile

@@ -15,11 +15,14 @@ endif
 checkstyle:
 	poetry run pre-commit run --all-files
 
+collectstatic:
+	poetry run python manage.py collectstatic --noinput
+
 init:
 	poetry install
 	poetry run pre-commit install
 	poetry run python manage.py migrate
-	poetry run python manage.py collectstatic --noinput
+	make collectstatic
 	poetry run python manage.py import_sample_data
 	poetry shell
 
@@ -33,7 +36,7 @@ update_dsfr:
 	bash scripts/download_latest.sh
 	poetry run python manage.py trim_dist
 	poetry run python manage.py integrity_checksums
-	poetry run python manage.py collecstatic --noinput
+	make collectstatic
 
 static_server:
 	python -m http.server $(local_port) -d docs/

README.rst

@@ -1,3 +1,6 @@
+.. image:: https://img.shields.io/github/v/release/numerique-gouv/django-dsfr.svg
+    :target: https://github.com/numerique-gouv/django-dsfr/releases/
+
 .. image:: https://badge.fury.io/py/django-dsfr.svg
     :target: https://pypi.org/project/django-dsfr/
 
@@ -20,7 +23,7 @@ Django-DSFR is a Django app to integrate the `French government Design System ("
 
 This app is very much a work in progress. See the `documentation (in French) <https://numerique-gouv.github.io/django-dsfr/>`_ for details.
 
-Django-DSFR (partly) implements the `version 1.11 of the DSFR <https://www.systeme-de-design.gouv.fr/a-propos/versions/version-courante>`_.
+Django-DSFR (partly) implements the `version 1.11.2 of the DSFR <https://www.systeme-de-design.gouv.fr/a-propos/versions/version-courante>`_ (see also the `Github releases page <https://github.com/GouvernementFR/dsfr/releases/>`_)
 
 Requirements
 ------------

dsfr/checksums.py

@@ -5,27 +5,27 @@
 
 # dsfr/static/dsfr/dist/dsfr/dsfr.module.min.js
 INTEGRITY_JS_MODULE = (
-    "sha384-0OQ6Q9ZAssur6KZKIPnF76AYck9k+vzDJ4QWGEQSpmU5qWtHIr9eN2/9/GOKiJeg"
+    "sha384-ToZ2KPANcYOYrPshKd8bJxk+utYf7qGe3ob4+NkCjeda5DRDtM9tp5GTyMGXakre"
 )
 
 # dsfr/static/dsfr/dist/dsfr/dsfr.nomodule.min.js
 INTEGRITY_JS_NOMODULE = (
-    "sha384-lbZ4GtXN8+9/PJKGoM35lJokzC+dXV3JFLZgwg7G/rkeZATNoF6VRX+4agY6raLu"
+    "sha384-OJq7jonDJ6QWsuRqnCWE3Gep7eKu0DEaasALVb40NLARi4cGCIjgVHHhnGJuByNq"
 )
 
 # dsfr/static/dsfr/dist/dsfr/dsfr.min.css
 INTEGRITY_CSS = (
-    "sha384-diNcOMzsBeI3kzBRfiZqv56Oi4WBnUJhcubWpNsTCigDuxMUPJMGgMlE9KSfFyb1"
+    "sha384-dPQgYpB1TxmQr6BYJVjZno5onyq5FTc2Y1VkxUIteXfWQjORdOWc/Zh0lODQsnx+"
 )
 
 # dsfr/static/dsfr/dist/utility/utility.min.css
 INTEGRITY_UTILITY_CSS = (
-    "sha384-vOc3XkofBfoLSvbeQlBwi+97miTEHOov9VEn2sRVxml5nJ7hsGR2pSQsrMqstPjD"
+    "sha384-zyJ07edvc/zdLxAnpNVT3jkcNOeweHoBlOrSwGeWsxRPByiIJaeEKdeV0FgNwW3K"
 )
 
 # dsfr/static/dsfr/dist/utility/icons/icons.min.css
 INTEGRITY_CSS_ICONS = (
-    "sha384-rEPdGS1CzbNKp1iHewzg1GXyWg9OacK//IkYEX1YqrrqQwxWX7+7OiqoCokyCSuQ"
+    "sha384-hA1C/qFm8PMx34t5U8FWKqgBEpwdfdZNZFnwJjfMVEaRo8ug9qk78uDwa+3CPByj"
 )
 
 # dsfr/static/dsfr/dist/favicon/apple-touch-icon.png