From 7aba4bb93cf1627ced88b38c895d61b5f281dc02 Mon Sep 17 00:00:00 2001 From: Sylvain Boissel Date: Thu, 25 Apr 2024 14:58:36 +0200 Subject: [PATCH] =?UTF-8?q?Am=C3=A9liorations=20mineures=20des=20templates?= =?UTF-8?q?=20(#142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced HTML commments by Django-Template comments * Add favicon in admin * Renamed django project to config * Update doc * Update version number * Update dependencies --- {example => config}/__init__.py | 0 {example => config}/asgi.py | 4 +- {example => config}/settings.py | 6 +- {example => config}/urls.py | 8 ++ {example => config}/wsgi.py | 4 +- dsfr/templates/dsfr/footer.html | 5 +- dsfr/templates/dsfr/form_base.html | 10 +- dsfr/templates/dsfr/theme_modale.html | 6 +- example_app/static/json/search_data.json | 6 +- .../templates/example_app/blocks/footer.html | 5 +- .../templates/example_app/example_form.html | 6 +- .../example_app/example_formset.html | 6 +- .../templates/example_app/page_component.html | 1 - manage.py | 2 +- poetry.lock | 99 ++++++++++--------- pyproject.toml | 2 +- 16 files changed, 88 insertions(+), 82 deletions(-) rename {example => config}/__init__.py (100%) rename {example => config}/asgi.py (73%) rename {example => config}/settings.py (97%) rename {example => config}/urls.py (72%) rename {example => config}/wsgi.py (73%) diff --git a/example/__init__.py b/config/__init__.py similarity index 100% rename from example/__init__.py rename to config/__init__.py diff --git a/example/asgi.py b/config/asgi.py similarity index 73% rename from example/asgi.py rename to config/asgi.py index aad1fda3d..557392bcb 100644 --- a/example/asgi.py +++ b/config/asgi.py @@ -1,5 +1,5 @@ """ -ASGI config for example project. +ASGI config for django-dsfr project. It exposes the ASGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ from django.core.asgi import get_asgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") application = get_asgi_application() diff --git a/example/settings.py b/config/settings.py similarity index 97% rename from example/settings.py rename to config/settings.py index 995fe3412..a7b7fa027 100644 --- a/example/settings.py +++ b/config/settings.py @@ -1,5 +1,5 @@ """ -Django settings for example project. +Django settings for django-dsfr project. Generated by 'django-admin startproject' using Django 3.2.5. @@ -61,7 +61,7 @@ "django.middleware.clickjacking.XFrameOptionsMiddleware", ] -ROOT_URLCONF = "example.urls" +ROOT_URLCONF = "config.urls" TEMPLATES = [ { @@ -83,7 +83,7 @@ if DJANGO_VERSION < (5, 0): FORM_RENDERER = "django.forms.renderers.TemplatesSetting" -WSGI_APPLICATION = "example.wsgi.application" +WSGI_APPLICATION = "config.wsgi.application" # Database diff --git a/example/urls.py b/config/urls.py similarity index 72% rename from example/urls.py rename to config/urls.py index e4c4a4260..a127e7e77 100644 --- a/example/urls.py +++ b/config/urls.py @@ -1,10 +1,18 @@ from django.contrib import admin +from django.contrib.staticfiles.storage import staticfiles_storage from django.conf import settings from django.conf.urls.static import static from django.urls import include, path from django.views.generic import RedirectView + urlpatterns = [ + path( + "favicon.ico", + RedirectView.as_view( + url=staticfiles_storage.url("dsfr/dist/favicon/favicon.ico") + ), + ), # The "django-dsfr/" prefix is here because this site is deployed as doc on # https://numerique-gouv.github.io/django-dsfr/ path("admin/", admin.site.urls), diff --git a/example/wsgi.py b/config/wsgi.py similarity index 73% rename from example/wsgi.py rename to config/wsgi.py index 00adc8ad7..6d4c24fa2 100644 --- a/example/wsgi.py +++ b/config/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for example project. +WSGI config for django-dsfr project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") application = get_wsgi_application() diff --git a/dsfr/templates/dsfr/footer.html b/dsfr/templates/dsfr/footer.html index c4432a90c..07ccb1ada 100644 --- a/dsfr/templates/dsfr/footer.html +++ b/dsfr/templates/dsfr/footer.html @@ -20,15 +20,14 @@ src="{{ SITE_CONFIG.operator_logo_file.url }}" alt="{{ SITE_CONFIG.operator_logo_alt }}" {% if SITE_CONFIG.operator_logo_width >= 1 %}style="max-width:{{ SITE_CONFIG.operator_logo_width }}rem;"{% endif %} /> - + {# L’alternative de l’image (attribut alt) doit impérativement être renseignée et reprendre le texte visible dans l’image #} {% else %}
+ title="{{ back_to_home_label }} - {{ SITE_CONFIG.site_title }} - {{ SITE_CONFIG.footer_brand|default:'république française' }}"> {% block brand %}

- + {# L’alternative de l’image (attribut alt) doit rester vide car l’image est illustrative et ne doit pas être restituée aux technologies d’assistance #}

@@ -47,7 +47,7 @@

- + {# L’alternative de l’image (attribut alt) doit rester vide car l’image est illustrative et ne doit pas être restituée aux technologies d’assistance #}

@@ -61,7 +61,7 @@

- + {# L’alternative de l’image (attribut alt) doit rester vide car l’image est illustrative et ne doit pas être restituée aux technologies d’assistance #}

diff --git a/example_app/static/json/search_data.json b/example_app/static/json/search_data.json index d2c47c1f5..4b28e5cb8 100644 --- a/example_app/static/json/search_data.json +++ b/example_app/static/json/search_data.json @@ -2,7 +2,7 @@ { "filename": "homepage", "path": "/django-dsfr/index.html", - "text": "Django-DSFR Documentation Django-dsfr est une application django permettant d\u2019utiliser le syst\u00e8me de design de l\u2019\u00c9tat dans des projets Django. Elle a initialement \u00e9t\u00e9 d\u00e9velopp\u00e9e dans le cadre du d\u00e9fi Open Collectivit\u00e9s et est un travail en cours (les composants sont actuellement d\u00e9velopp\u00e9s au fur et \u00e0 mesure de leur utilisation), cf. la page Composants. Sommaire Installation Utilisation D\u00e9veloppement Notes Installation Voir la page Installation. Utilisation Voir la page Utilisation. Les explications sur l\u2019utilisation de chaque composant figurent sur leur entr\u00e9e d\u00e9di\u00e9e, accessible via la page Composants. D\u00e9veloppement Voir la page Contribuer. Notes Il est possible d\u2019utiliser tous les composants du DSFR directement avec leur code HTML, y compris ceux pour lesquels il n\u2019existe pas encore de balise. De m\u00eame pour certains o\u00f9 il vaut mieux cr\u00e9er un template ad-hoc \u00e0 chaque utilisation, comme les modales.", + "text": "Django-DSFR Documentation Django-dsfr est une application django permettant d\u2019utiliser le syst\u00e8me de design de l\u2019\u00c9tat dans des projets Django. Elle a initialement \u00e9t\u00e9 d\u00e9velopp\u00e9e dans le cadre du d\u00e9fi Open Collectivit\u00e9s et est un travail en cours (les composants sont actuellement d\u00e9velopp\u00e9s au fur et \u00e0 mesure de leur utilisation), cf. la page Composants. Sommaire Installation Utilisation D\u00e9veloppement Notes Installation Voir la page Installation. Utilisation Voir la page Utilisation. Les explications sur l\u2019utilisation de chaque composant figurent sur leur entr\u00e9e d\u00e9di\u00e9e, accessible via la page Composants. D\u00e9veloppement Voir la page Contribuer. Notes Il est possible d\u2019utiliser tous les composants du DSFR directement avec leur code HTML, y compris ceux pour lesquels il n\u2019existe pas de balise. De m\u00eame pour certains o\u00f9 il vaut mieux cr\u00e9er un template ad-hoc \u00e0 chaque utilisation, comme les modales.", "title": "Accueil \u2014 Django-DSFR" }, { @@ -26,13 +26,13 @@ { "filename": "icons", "path": "/django-dsfr/resources/icons/index.html", - "text": "Ic\u00f4nes Sommaire Buildings Business Communication Design Development Device Document Editor Finance Health Logo Map Media Others System User Weather Voir la page de documentation du composant sur le Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Voir la page sur le site d\u2019exemples du Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Cliquer sur une ic\u00f4ne ci-dessous pour copier le nom de sa classe. Buildings Business Communication Design Development Device Document Editor Finance Health Logo Map Media Others System User Weather", + "text": "Ic\u00f4nes Voir la page de documentation du composant sur le Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Voir la page sur le site d\u2019exemples du Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Chercher une ic\u00f4ne par son nom Chercher une ic\u00f4ne Liste compl\u00e8te Sommaire Buildings Business Communication Design Development Device Document Editor Finance Health Logo Map Media Others System User Weather Cliquer sur une ic\u00f4ne ci-dessous pour copier le nom de sa classe. Buildings Business Communication Design Development Device Document Editor Finance Health Logo Map Media Others System User Weather", "title": "Ic\u00f4nes \u2014 Django-DSFR" }, { "filename": "colors", "path": "/django-dsfr/resources/colors/index.html", - "text": "Couleurs Voir la page de pr\u00e9sentation de la palette de couleurs sur le Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Voir la page de r\u00e8gles d\u2019utilisation de la palette de couleurs sur le Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Cartes et tuiles Les cartes et tuiles peuvent prendre un fond gris \u00e0 la place de la couleur par d\u00e9faut. Carte basique Texte de la carte. Il peut prendre jusqu\u2019\u00e0 200 caract\u00e8res, ce qui devrait correspondre \u00e0 environ cinq lignes dans le mode vertical, et deux en horizontal. \u2026 Carte basique Texte de la carte. Il peut prendre jusqu\u2019\u00e0 200 caract\u00e8res, ce qui devrait correspondre \u00e0 environ cinq lignes dans le mode vertical, et deux en horizontal. \u2026 Tuile basique (verticale, MD) Tuile basique (verticale, MD) Tuile basique (verticale, MD) Tuile basique (verticale, MD) Couleurs d\u2019accentuation Certains composants prennent une couleur d\u2019accentuation comme param\u00e8tre. Seules les couleurs illustratives sont prises en compte. Choisissez une couleur ---- Thilleul verveine Bourgeon \u00c9meraude Menthe Archipel \u00c9cume Cumulus Glycine Macaron Tuile Tournesol Moutarde Terre battue Caf\u00e9 cr\u00e8me Caramel Op\u00e9ra Gris galet Citation Personnalise la couleur de l\u2019ic\u00f4ne. D\u00e9velopper vos sites et applications en utilisant des composants pr\u00eats \u00e0 l\u2019emploi, accessibles et ergonomiques Auteur Syst\u00e8me de Design de l'\u00c9tat D\u00e9tail sans lien D\u00e9tail avec lien Ouvre une nouvelle fen\u00eatre Mise en avant Personnalise la couleur du fond et de la bordure. Mise en avant avec bouton normal Cette mise en avant a un bouton normal Bouton normal Mise en exergue Personnalise la couleur de la bordure. Contenu de la mise en exergue Tableau Personnalise la couleur de la bordure et du fond. Tableau basique Colonne 1 Colonne 2 Colonne 3 a b c d e f Tag Personnalise la couleur de la bordure, du fond et de l\u2019ic\u00f4ne. Seuls les tags cliquables sont pris en compte. Tag avec lien Tag avec action", + "text": "Couleurs Voir la page de pr\u00e9sentation de la palette de couleurs sur le Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Voir la page de r\u00e8gles d\u2019utilisation de la palette de couleurs sur le Syst\u00e8me de Design de l\u2019\u00c9tat Ouvre une nouvelle fen\u00eatre Cartes et tuiles Les cartes et tuiles peuvent prendre un fond gris \u00e0 la place de la couleur par d\u00e9faut. Carte basique Texte de la carte. Il peut prendre jusqu\u2019\u00e0 200 caract\u00e8res, ce qui devrait correspondre \u00e0 environ cinq lignes dans le mode vertical, et deux en horizontal. \u2026 Carte basique Texte de la carte. Il peut prendre jusqu\u2019\u00e0 200 caract\u00e8res, ce qui devrait correspondre \u00e0 environ cinq lignes dans le mode vertical, et deux en horizontal. \u2026 Tuile basique (verticale, MD) Tuile basique (verticale, MD) Tuile basique (verticale, MD) Tuile basique (verticale, MD) Couleurs d\u2019accentuation Certains composants prennent une couleur d\u2019accentuation comme param\u00e8tre. Seules les couleurs illustratives sont prises en compte. Choisissez une couleur ---- Tilleul verveine Bourgeon \u00c9meraude Menthe Archipel \u00c9cume Cumulus Glycine Macaron Tuile Tournesol Moutarde Terre battue Caf\u00e9 cr\u00e8me Caramel Op\u00e9ra Gris galet Citation Personnalise la couleur de l\u2019ic\u00f4ne. D\u00e9velopper vos sites et applications en utilisant des composants pr\u00eats \u00e0 l\u2019emploi, accessibles et ergonomiques Auteur Syst\u00e8me de Design de l'\u00c9tat D\u00e9tail sans lien D\u00e9tail avec lien Ouvre une nouvelle fen\u00eatre Mise en avant Personnalise la couleur du fond et de la bordure. Mise en avant avec bouton normal Cette mise en avant a un bouton normal Bouton normal Mise en exergue Personnalise la couleur de la bordure. Contenu de la mise en exergue Tableau Personnalise la couleur de la bordure et du fond. Tableau basique Colonne 1 Colonne 2 Colonne 3 a b c d e f Tag Personnalise la couleur de la bordure, du fond et de l\u2019ic\u00f4ne. Seuls les tags cliquables sont pris en compte. Tag avec lien Tag avec action", "title": "Couleurs \u2014 Django-DSFR" }, { diff --git a/example_app/templates/example_app/blocks/footer.html b/example_app/templates/example_app/blocks/footer.html index 322264e48..8d87e23ab 100644 --- a/example_app/templates/example_app/blocks/footer.html +++ b/example_app/templates/example_app/blocks/footer.html @@ -30,15 +30,14 @@ src="{{ SITE_CONFIG.operator_logo_file.url }}" alt="{{ SITE_CONFIG.operator_logo_alt }}" {% if SITE_CONFIG.operator_logo_width >= 1 %}style="max-width:{{ SITE_CONFIG.operator_logo_width }}rem;"{% endif %} /> - + {# L’alternative de l’image (attribut alt) doit impérativement être renseignée et reprendre le texte visible dans l’image #} {% else %}
+ title="{{ back_to_home_label }} - {{ SITE_CONFIG.site_title }} - {{ SITE_CONFIG.footer_brand|default:'république française' }}"> {% block brand %}

Exemple de formulaire avec formset

{% endblock head_form %} - +{# If you use formset, you need to include a template which extends formset-base.html, and put it in a block of form_base.html #} {% block extra_formset_after %} {% include "example_app/example_formset.html" %} {% endblock extra_formset_after %} - +{# Don't forget you dsfr button to submit the form #} {% block foot_form %} {% dsfr_button btn_submit %} {% endblock foot_form %} diff --git a/example_app/templates/example_app/example_formset.html b/example_app/templates/example_app/example_formset.html index d7e5c16d2..5783a3e71 100644 --- a/example_app/templates/example_app/example_formset.html +++ b/example_app/templates/example_app/example_formset.html @@ -1,7 +1,7 @@ - - +{# Instead of extending base.html, extend formset-base.html #} +{# Then, include this template in another template which extends form_base.html #} {% extends "dsfr/formset_base.html" %} - +{# You can add some information to the formset inside the blocks of formset-base.html #} {% block formset_title %} {% if formset %}

diff --git a/example_app/templates/example_app/page_component.html b/example_app/templates/example_app/page_component.html index c2de2f254..a221f7df1 100644 --- a/example_app/templates/example_app/page_component.html +++ b/example_app/templates/example_app/page_component.html @@ -22,7 +22,6 @@ {% block content %}
-
{% dsfr_sidemenu side_menu extra_classes="" %}
diff --git a/manage.py b/manage.py index c6b69b9c4..d28672eae 100755 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ def main(): """Run administrative tasks.""" - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/poetry.lock b/poetry.lock index 3f8c40323..27f2c3511 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "asgiref" @@ -19,18 +19,18 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"] [[package]] name = "backports-tarfile" -version = "1.0.0" +version = "1.1.1" description = "Backport of CPython tarfile module" optional = false python-versions = ">=3.8" files = [ - {file = "backports.tarfile-1.0.0-py3-none-any.whl", hash = "sha256:bcd36290d9684beb524d3fe74f4a2db056824c47746583f090b8e55daf0776e4"}, - {file = "backports.tarfile-1.0.0.tar.gz", hash = "sha256:2688f159c21afd56a07b75f01306f9f52c79aebcc5f4a117fb8fbb4445352c75"}, + {file = "backports.tarfile-1.1.1-py3-none-any.whl", hash = "sha256:73e0179647803d3726d82e76089d01d8549ceca9bace469953fcb4d97cf2d417"}, + {file = "backports_tarfile-1.1.1.tar.gz", hash = "sha256:9c2ef9696cb73374f7164e17fc761389393ca76777036f5aad42e8b93fcd8009"}, ] [package.extras] docs = ["furo", "jaraco.packaging (>=9.3)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)"] +testing = ["jaraco.test", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)"] [[package]] name = "backports-zoneinfo" @@ -107,33 +107,33 @@ lxml = ["lxml"] [[package]] name = "black" -version = "24.4.0" +version = "24.4.1" description = "The uncompromising code formatter." optional = false python-versions = ">=3.8" files = [ - {file = "black-24.4.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6ad001a9ddd9b8dfd1b434d566be39b1cd502802c8d38bbb1ba612afda2ef436"}, - {file = "black-24.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3a3a092b8b756c643fe45f4624dbd5a389f770a4ac294cf4d0fce6af86addaf"}, - {file = "black-24.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dae79397f367ac8d7adb6c779813328f6d690943f64b32983e896bcccd18cbad"}, - {file = "black-24.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:71d998b73c957444fb7c52096c3843875f4b6b47a54972598741fe9a7f737fcb"}, - {file = "black-24.4.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8e5537f456a22cf5cfcb2707803431d2feeb82ab3748ade280d6ccd0b40ed2e8"}, - {file = "black-24.4.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:64e60a7edd71fd542a10a9643bf369bfd2644de95ec71e86790b063aa02ff745"}, - {file = "black-24.4.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd5b4f76056cecce3e69b0d4c228326d2595f506797f40b9233424e2524c070"}, - {file = "black-24.4.0-cp311-cp311-win_amd64.whl", hash = "sha256:64578cf99b6b46a6301bc28bdb89f9d6f9b592b1c5837818a177c98525dbe397"}, - {file = "black-24.4.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f95cece33329dc4aa3b0e1a771c41075812e46cf3d6e3f1dfe3d91ff09826ed2"}, - {file = "black-24.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4396ca365a4310beef84d446ca5016f671b10f07abdba3e4e4304218d2c71d33"}, - {file = "black-24.4.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:44d99dfdf37a2a00a6f7a8dcbd19edf361d056ee51093b2445de7ca09adac965"}, - {file = "black-24.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:21f9407063ec71c5580b8ad975653c66508d6a9f57bd008bb8691d273705adcd"}, - {file = "black-24.4.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:652e55bb722ca026299eb74e53880ee2315b181dfdd44dca98e43448620ddec1"}, - {file = "black-24.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f2966b9b2b3b7104fca9d75b2ee856fe3fdd7ed9e47c753a4bb1a675f2caab8"}, - {file = "black-24.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1bb9ca06e556a09f7f7177bc7cb604e5ed2d2df1e9119e4f7d2f1f7071c32e5d"}, - {file = "black-24.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:d4e71cdebdc8efeb6deaf5f2deb28325f8614d48426bed118ecc2dcaefb9ebf3"}, - {file = "black-24.4.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6644f97a7ef6f401a150cca551a1ff97e03c25d8519ee0bbc9b0058772882665"}, - {file = "black-24.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:75a2d0b4f5eb81f7eebc31f788f9830a6ce10a68c91fbe0fade34fff7a2836e6"}, - {file = "black-24.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eb949f56a63c5e134dfdca12091e98ffb5fd446293ebae123d10fc1abad00b9e"}, - {file = "black-24.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:7852b05d02b5b9a8c893ab95863ef8986e4dda29af80bbbda94d7aee1abf8702"}, - {file = "black-24.4.0-py3-none-any.whl", hash = "sha256:74eb9b5420e26b42c00a3ff470dc0cd144b80a766128b1771d07643165e08d0e"}, - {file = "black-24.4.0.tar.gz", hash = "sha256:f07b69fda20578367eaebbd670ff8fc653ab181e1ff95d84497f9fa20e7d0641"}, + {file = "black-24.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1f7749fd0d97ff9415975a1432fac7df89bf13c3833cea079e55fa004d5f28c0"}, + {file = "black-24.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:859f3cc5d2051adadf8fd504a01e02b0fd866d7549fff54bc9202d524d2e8bd7"}, + {file = "black-24.4.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59271c9c29dfa97f7fda51f56c7809b3f78e72fd8d2205189bbd23022a0618b6"}, + {file = "black-24.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:5ed9c34cba223149b5a0144951a0f33d65507cf82c5449cb3c35fe4b515fea9a"}, + {file = "black-24.4.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9dae3ae59d6f2dc93700fd5034a3115434686e66fd6e63d4dcaa48d19880f2b0"}, + {file = "black-24.4.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5f8698974a81af83283eb47644f2711b5261138d6d9180c863fce673cbe04b13"}, + {file = "black-24.4.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f404b6e77043b23d0321fb7772522b876b6de737ad3cb97d6b156638d68ce81"}, + {file = "black-24.4.1-cp311-cp311-win_amd64.whl", hash = "sha256:c94e52b766477bdcd010b872ba0714d5458536dc9d0734eff6583ba7266ffd89"}, + {file = "black-24.4.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:962d9e953872cdb83b97bb737ad47244ce2938054dc946685a4cad98520dab38"}, + {file = "black-24.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b1d8e3b2486b7dd522b1ab2ba1ec4907f0aa8f5e10a33c4271fb331d1d10b70c"}, + {file = "black-24.4.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed77e214b785148f57e43ca425b6e0850165144aa727d66ac604e56a70bb7825"}, + {file = "black-24.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:4ef4764437d7eba8386689cd06e1fb5341ee0ae2e9e22582b21178782de7ed94"}, + {file = "black-24.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:92b183f8eef5baf7b20a513abcf982ad616f544f593f6688bb2850d2982911f1"}, + {file = "black-24.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:945abd7b3572add997757c94295bb3e73c6ffaf3366b1f26cb2356a4bffd1dc3"}, + {file = "black-24.4.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db5154b9e5b478031371d8bc41ff37b33855fa223a6cfba456c9b73fb96f77d4"}, + {file = "black-24.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:afc84c33c1a9aaf3d73140cee776b4ddf73ff429ffe6b7c56dc1c9c10725856d"}, + {file = "black-24.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0889f4eb8b3bdf8b189e41a71cf0dbb8141a98346cd1a2695dea5995d416e940"}, + {file = "black-24.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5bb0143f175db45a55227eefd63e90849d96c266330ba31719e9667d0d5ec3b9"}, + {file = "black-24.4.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:713a04a78e78f28ef7e8df7a16fe075670ea164860fcef3885e4f3dffc0184b3"}, + {file = "black-24.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:171959bc879637a8cdbc53dc3fddae2a83e151937a28cf605fd175ce61e0e94a"}, + {file = "black-24.4.1-py3-none-any.whl", hash = "sha256:ecbab810604fe02c70b3a08afd39beb599f7cc9afd13e81f5336014133b4fe35"}, + {file = "black-24.4.1.tar.gz", hash = "sha256:5241612dc8cad5b6fd47432b8bd04db80e07cfbc53bb69e9ae18985063bcb8dd"}, ] [package.dependencies] @@ -645,13 +645,13 @@ files = [ [[package]] name = "exceptiongroup" -version = "1.2.0" +version = "1.2.1" description = "Backport of PEP 654 (exception groups)" optional = false python-versions = ">=3.7" files = [ - {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, - {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, + {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"}, + {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"}, ] [package.extras] @@ -697,13 +697,13 @@ files = [ [[package]] name = "identify" -version = "2.5.35" +version = "2.5.36" description = "File identification library for Python" optional = false python-versions = ">=3.8" files = [ - {file = "identify-2.5.35-py2.py3-none-any.whl", hash = "sha256:c4de0081837b211594f8e877a6b4fad7ca32bbfc1a9307fdd61c28bfe923f13e"}, - {file = "identify-2.5.35.tar.gz", hash = "sha256:10a7ca245cfcd756a554a7288159f72ff105ad233c7c4b9c6f0f4d108f5f6791"}, + {file = "identify-2.5.36-py2.py3-none-any.whl", hash = "sha256:37d93f380f4de590500d9dba7db359d0d3da95ffe7f9de1753faa159e71e7dfa"}, + {file = "identify-2.5.36.tar.gz", hash = "sha256:e5e00f54165f9047fbebeb4a560f9acfb8af4c88232be60a488e9b68d122745d"}, ] [package.extras] @@ -806,13 +806,13 @@ testing = ["portend", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytes [[package]] name = "jaraco-functools" -version = "4.0.0" +version = "4.0.1" description = "Functools like those found in stdlib" optional = false python-versions = ">=3.8" files = [ - {file = "jaraco.functools-4.0.0-py3-none-any.whl", hash = "sha256:daf276ddf234bea897ef14f43c4e1bf9eefeac7b7a82a4dd69228ac20acff68d"}, - {file = "jaraco.functools-4.0.0.tar.gz", hash = "sha256:c279cb24c93d694ef7270f970d499cab4d3813f4e08273f95398651a634f0925"}, + {file = "jaraco.functools-4.0.1-py3-none-any.whl", hash = "sha256:3b24ccb921d6b593bdceb56ce14799204f473976e2a9d4b15b04d0f2c2326664"}, + {file = "jaraco_functools-4.0.1.tar.gz", hash = "sha256:d33fa765374c0611b52f8b3a795f8900869aa88c84769d4d1746cd68fb28c3e8"}, ] [package.dependencies] @@ -820,7 +820,7 @@ more-itertools = "*" [package.extras] docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["jaraco.classes", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff"] +testing = ["jaraco.classes", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-ruff (>=0.2.1)"] [[package]] name = "jeepney" @@ -1222,28 +1222,29 @@ testing = ["pytest", "pytest-cov", "wheel"] [[package]] name = "platformdirs" -version = "4.2.0" -description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +version = "4.2.1" +description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.8" files = [ - {file = "platformdirs-4.2.0-py3-none-any.whl", hash = "sha256:0614df2a2f37e1a662acbd8e2b25b92ccf8632929bc6d43467e17fe89c75e068"}, - {file = "platformdirs-4.2.0.tar.gz", hash = "sha256:ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768"}, + {file = "platformdirs-4.2.1-py3-none-any.whl", hash = "sha256:17d5a1161b3fd67b390023cb2d3b026bbd40abde6fdb052dfbd3a29c3ba22ee1"}, + {file = "platformdirs-4.2.1.tar.gz", hash = "sha256:031cd18d4ec63ec53e82dceaac0417d218a6863f7745dfcc9efe7793b7039bdf"}, ] [package.extras] docs = ["furo (>=2023.9.10)", "proselint (>=0.13)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)"] +type = ["mypy (>=1.8)"] [[package]] name = "pluggy" -version = "1.4.0" +version = "1.5.0" description = "plugin and hook calling mechanisms for python" optional = false python-versions = ">=3.8" files = [ - {file = "pluggy-1.4.0-py3-none-any.whl", hash = "sha256:7db9f7b503d67d1c5b95f59773ebb58a8c1c288129a88665838012cfb07b8981"}, - {file = "pluggy-1.4.0.tar.gz", hash = "sha256:8c85c2876142a764e5b7548e7d9a0e0ddb46f5185161049a79b7e974454223be"}, + {file = "pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669"}, + {file = "pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1"}, ] [package.extras] @@ -1767,13 +1768,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "virtualenv" -version = "20.25.1" +version = "20.26.0" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.25.1-py3-none-any.whl", hash = "sha256:961c026ac520bac5f69acb8ea063e8a4f071bcc9457b9c1f28f6b085c511583a"}, - {file = "virtualenv-20.25.1.tar.gz", hash = "sha256:e08e13ecdca7a0bd53798f356d5831434afa5b07b93f0abdf0797b7a06ffe197"}, + {file = "virtualenv-20.26.0-py3-none-any.whl", hash = "sha256:0846377ea76e818daaa3e00a4365c018bc3ac9760cbb3544de542885aad61fb3"}, + {file = "virtualenv-20.26.0.tar.gz", hash = "sha256:ec25a9671a5102c8d2657f62792a27b48f016664c6873f6beed3800008577210"}, ] [package.dependencies] @@ -1782,7 +1783,7 @@ filelock = ">=3.12.2,<4" platformdirs = ">=3.9.1,<5" [package.extras] -docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] [[package]] diff --git a/pyproject.toml b/pyproject.toml index c52b0c756..0e56ccb8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ authors = ["Sylvain Boissel "] description = "Integrate the French government Design System into a Django app" license = "MIT" name = "django-dsfr" -version = "1.1.1" +version = "1.1.2" classifiers = [ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment",