From 18ff7f954436e465ebfd6e5ae25edf2fbebd99e9 Mon Sep 17 00:00:00 2001 From: "Mees, T.D. (Ty)" Date: Wed, 12 Jun 2024 12:04:09 +0200 Subject: [PATCH 1/4] feat: clearer warning messages --- locale/en/LC_MESSAGES/django.po | 168 +++++++++++++++++++------------- main/templates/main/index.html | 50 ++++++---- 2 files changed, 133 insertions(+), 85 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index e6a4c4004..a11280ae3 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-15 11:16+0200\n" +"POT-Creation-Date: 2024-06-12 12:01+0200\n" "PO-Revision-Date: 2024-04-03 12:32+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.4.1\n" -#: faqs/menus.py:7 main/templates/main/index.html:187 +#: faqs/menus.py:7 main/templates/main/index.html:201 msgid "FETC-GW website" msgstr "FEtC-H website" @@ -29,12 +29,12 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/" msgid "Reglement FETC-GW" msgstr "Regulations FEtC-H" -#: faqs/menus.py:13 main/templates/main/index.html:190 +#: faqs/menus.py:13 main/templates/main/index.html:204 #: proposals/templates/proposals/proposal_start_pre_approved.html:11 msgid "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/" msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/" -#: faqs/menus.py:17 main/templates/main/index.html:194 +#: faqs/menus.py:17 main/templates/main/index.html:208 #: proposals/templates/proposals/study_consent.html:8 #: proposals/templates/proposals/translated_consent_forms.html:7 #: proposals/utils/pdf_diff_logic.py:878 @@ -149,7 +149,7 @@ msgid "Het interventieonderzoek" msgstr "Intervention study" #: interventions/templates/interventions/intervention_form.html:17 -#: main/models.py:50 +#: main/models.py:54 #: observations/templates/observations/observation_form.html:26 #: studies/templates/studies/study_end.html:65 #: studies/templates/studies/study_end.html:96 @@ -192,7 +192,7 @@ msgid "Dit veld is verplicht." msgstr "This field is required." #: main/menus.py:6 main/templates/main/index.html:7 -#: main/templates/main/index.html:53 main/templates/main/landing.html:33 +#: main/templates/main/index.html:67 main/templates/main/landing.html:33 msgid "Startpagina" msgstr "Start page" @@ -204,29 +204,29 @@ msgstr "Log in" msgid "Log uit" msgstr "Log out" -#: main/models.py:8 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244 +#: main/models.py:12 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244 msgid "ja" msgstr "yes" -#: main/models.py:9 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244 +#: main/models.py:13 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244 msgid "nee" msgstr "no" -#: main/models.py:10 +#: main/models.py:14 msgid "twijfel" msgstr "uncertain" -#: main/models.py:59 +#: main/models.py:63 msgid "Geef aan waar de dataverzameling plaatsvindt" msgstr "Specify where the data collection will take place" -#: main/models.py:63 observations/models.py:139 proposals/models.py:282 +#: main/models.py:67 observations/models.py:139 proposals/models.py:282 #: studies/models.py:211 studies/models.py:253 tasks/models.py:169 #: tasks/models.py:181 msgid "Namelijk" msgstr "Please specify" -#: main/models.py:69 +#: main/models.py:73 msgid "" "Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of " "een ander persoon die bevoegd is?" @@ -234,13 +234,13 @@ msgstr "" "Will the task be conducted under the supervision of the teacher or another " "qualified person?" -#: main/models.py:76 +#: main/models.py:80 msgid "Is de testleider in het bezit van een VOG?" msgstr "" "Does the test leader hold a Certificate of Conduct (Verklaring Omtrent " "Gedrag, VOG)?" -#: main/models.py:78 +#: main/models.py:82 msgid "" "Iedereen die op een school werkt moet in het bezit zijn van een " "Verklaring Omtrent Gedrag (VOG, zie portalsupport.gw@uu.nl." msgstr "" -"If you suspect this is incorrect, please contact support at portalsupport.gw@uu.nl. " +"If you suspect this is incorrect, please contact portalsupport.gw@uu.nl" + +#: main/templates/main/index.html:41 +msgid "" +"Wij konden niet verifiëren bij welke faculteit je in dienst bent. Deze " +"portal is bedoeld voor medewerkers (en studenten) van de Faculteit " +"Geesteswetenschappen. Controleer of je inderdaad een aanvraag wilt indienen " +"bij de Facultaire Ethische Toetsingscommissie van Geesteswetenschappen." +msgstr "" +"We could not verify which faculty you are employed at. This portal is " +"intended for employees (and students) of the Faculty of Humanities. Please " +"check if you indeed want to submit an application to the Faculty Ethics " +"Assessment Committee of Humanities." -#: main/templates/main/index.html:59 +#: main/templates/main/index.html:49 +msgid "" +"Indien dat het geval is kan je de portal gewoon gebruiken. Voor vragen kan " +"je contact opnemen met portalsupport.gw@uu.nl." +msgstr "" +"If that is the case, you can still use the portal. If you have any " +"questions, you can contact portalsupport.gw@uu.nl" + +#: main/templates/main/index.html:73 msgid "" "Formele goedkeuring door één van beide kamers van de FETC-GW (middels een " "formele goedkeuringsbrief) is vereist voor mensgebonden onderzoek binnen de " @@ -605,7 +620,7 @@ msgstr "" "even to recruiting participants. Therefore, always wait for the letter of " "approval before starting research activities." -#: main/templates/main/index.html:64 +#: main/templates/main/index.html:78 msgid "" "NB: Goedgekeurde aanvragen komen in het archief van deze portal te staan, " "zie het menu hierboven. Dit archief is toegankelijk voor iedereen met een " @@ -615,7 +630,7 @@ msgstr "" "studying or working at the Faculty of Humanities with a Solis-ID can access " "this archive through the menu bar above." -#: main/templates/main/index.html:69 +#: main/templates/main/index.html:83 msgid "" "Heb je een vraag over de werking van de portal, ontdek je een foutje, " "missende functionaliteit, of verkeerde vertaling? Neem dan contact op met " @@ -626,13 +641,13 @@ msgstr "" "email to portalsupport.gw@uu.nl." -#: main/templates/main/index.html:75 +#: main/templates/main/index.html:89 #: proposals/templates/proposals/proposal_start.html:16 #: proposals/templates/proposals/proposal_start_practice.html:16 msgid "Check voor het indienen:" msgstr "Before submitting an application, please consult:" -#: main/templates/main/index.html:78 +#: main/templates/main/index.html:92 #: proposals/templates/proposals/proposal_start.html:19 #: proposals/templates/proposals/proposal_start_practice.html:19 msgid "" @@ -642,7 +657,7 @@ msgstr "" "The UU-" "webpage of the FEtC-H for news and upcoming dates." -#: main/templates/main/index.html:84 +#: main/templates/main/index.html:98 msgid "" "Het reglement van de FETC-GW." @@ -650,7 +665,7 @@ msgstr "" "The regulations of the FEtC-H ." -#: main/templates/main/index.html:90 +#: main/templates/main/index.html:104 msgid "" "Gebruik de juiste (meest recente) model documents for informed consent. (Latest " "version: December 2021)" -#: main/templates/main/index.html:96 +#: main/templates/main/index.html:110 msgid "" "
  • Voor advies over data management (plannen): datamanagement.gw@uu.nl.
  • Voor " @@ -679,93 +694,93 @@ msgstr "" "itself: portalsupport.gw@uu.nl." "
    • " -#: main/templates/main/index.html:112 +#: main/templates/main/index.html:126 msgid "In deze portal kan je het volgende doen:" msgstr "In this portal you can do the following:" -#: main/templates/main/index.html:120 +#: main/templates/main/index.html:134 msgid "Dien een nieuwe aanvraag in" msgstr "Submit a new proposal" -#: main/templates/main/index.html:124 +#: main/templates/main/index.html:138 msgid "die volledig nieuw is in deze portal;" msgstr "that is completely new in this portal;" -#: main/templates/main/index.html:127 +#: main/templates/main/index.html:141 msgid "op basis van een kopie van een oude aanvraag;" msgstr "from a copy of an old proposal;" -#: main/templates/main/index.html:130 +#: main/templates/main/index.html:144 msgid "voor (al dan niet goedgekeurde) subsidieaanvragen;" msgstr "to supplement a grant application" -#: main/templates/main/index.html:133 +#: main/templates/main/index.html:147 msgid "die al goedgekeurd is door een andere ethische toetsingscomissie." msgstr "that has been approved by another ethics committee." -#: main/templates/main/index.html:138 +#: main/templates/main/index.html:152 msgid "Een aanvraag reviseren" msgstr "Revise a proposal" -#: main/templates/main/index.html:142 +#: main/templates/main/index.html:156 msgid "als een revisie, gebaseerd op opmerkingen van de FETC-GW;" msgstr "as a revision, based on comments of the FEtC-H;" -#: main/templates/main/index.html:145 +#: main/templates/main/index.html:159 msgid "als amendement, wanneer de aanvraag al goedgekeurd is door de FETC-GW." msgstr "" "as an amendment, after your proposal has already been approved by the FEtC-H." -#: main/templates/main/index.html:152 +#: main/templates/main/index.html:166 msgid "Bekijk" msgstr "View" -#: main/templates/main/index.html:155 +#: main/templates/main/index.html:169 msgid "mijn conceptaanvragen;" msgstr "my draft applications;" -#: main/templates/main/index.html:158 +#: main/templates/main/index.html:172 msgid "mijn oefenaanvragen;" msgstr "my practice applications;" -#: main/templates/main/index.html:161 +#: main/templates/main/index.html:175 msgid "mijn ingediende aanvragen;" msgstr "my submitted applications;" -#: main/templates/main/index.html:164 +#: main/templates/main/index.html:178 msgid "mijn afgehandelde aanvragen;" msgstr "my processed applications;" -#: main/templates/main/index.html:167 +#: main/templates/main/index.html:181 msgid "mijn aanvragen als eindverantwoordelijke;" msgstr "my supervised applications;" -#: main/templates/main/index.html:170 +#: main/templates/main/index.html:184 msgid "al mijn aanvragen." msgstr "all my applications" -#: main/templates/main/index.html:173 +#: main/templates/main/index.html:187 msgid "FETC-GW archief" msgstr "FEtC-H archive" -#: main/templates/main/index.html:176 +#: main/templates/main/index.html:190 msgid "Alle goedgekeurde aanvragen bekijken van de Algemene Kamer" msgstr "View all processed and approved applications of the General Chamber" -#: main/templates/main/index.html:179 +#: main/templates/main/index.html:193 msgid "Alle goedgekeurde aanvragen bekijken van de Linguïstiek Kamer" msgstr "" "View all processed and approved applications of the Linguistics Chamber" -#: main/templates/main/index.html:190 +#: main/templates/main/index.html:204 msgid "Reglement van de FETC-GW" msgstr "Regulations of the FEtC-H" -#: main/templates/main/index.html:197 +#: main/templates/main/index.html:211 msgid "Veelgestelde vragen m.b.t. dit portal" msgstr "Frequently asked questions relating to this portal" -#: main/templates/main/index.html:204 +#: main/templates/main/index.html:218 msgid "Bannerfoto door Kim O'leary" msgstr "Cover image by Kim O'leary" @@ -2176,21 +2191,32 @@ msgid "Nuttige informatie:" msgstr "Useful information:" #: proposals/templates/proposals/proposal_data_management.html:87 +#, fuzzy +#| msgid "" +#| "Voor vragen over privacy, zoals: \"Wat zijn persoonlijke gegevens?\" of " +#| "\"Wanneer mag ik mijn onderzoek anoniem noemen?\", raden we je aan het Data " +#| "Privacy Handboek te raadplegen." msgid "" "Voor vragen over privacy, zoals: \"Wat zijn persoonlijke gegevens?\" of " "\"Wanneer mag ik mijn onderzoek anoniem noemen?\", raden we je aan het Data " -"Privacy Handboek te raadplegen." +"href=\"https://utrechtuniversity.github.io/dataprivacyhandbook/\" " +"target=\"_blank\">Data Privacy Handboek te raadplegen." msgstr "" "For all your questions regarding privacy, e.g.: \"What are personal data?\" " "or \"When may I call my research anonymous?\", consult the Data Privacy Handbook." -#: proposals/templates/proposals/proposal_data_management.html:93 +#: proposals/templates/proposals/proposal_data_management.html:94 +#, fuzzy +#| msgid "" +#| "Voor advies op het gebied van privacy en de AVG kun je contact opnemen " +#| "met de privacy officer van GW via privacy.gw@uu.nl." msgid "" "Voor advies op het gebied van privacy en de AVG kun je contact opnemen met " -"de privacy officer van GW via privacy." -"gw@uu.nl." +"de privacy officer van GW via privacy.gw@uu.nl." msgstr "" "For advice relating to privacy and the AVG, you can contact the privacy " "officer of the humanities at privacy." @@ -5244,3 +5270,11 @@ msgstr "Task edited" #: tasks/views/task_views.py:56 msgid "Taak verwijderd" msgstr "Task deleted" + +#~ msgid "Volgens onze gegevens werk/studeer je bij de" +#~ msgstr "According to our information, you work/study at the" + +#~ msgid "" +#~ "Volgens onze gegevens werk/studeer je bij een andere faculteit of dienst." +#~ msgstr "" +#~ "According to our data, you work/study at another faculty or service." diff --git a/main/templates/main/index.html b/main/templates/main/index.html index 10f923f63..e2a493cd1 100644 --- a/main/templates/main/index.html +++ b/main/templates/main/index.html @@ -14,30 +14,44 @@ {% if not is_humanities %}
    -

    - {% blocktrans trimmed %} - Deze portal is bedoeld voor medewerkers (en studenten) van de Faculteit Geesteswetenschappen. - {% endblocktrans %} - {% if user.faculties.all %} - {# Filters do not like blocktrans, so that value is just outside... #} + {% if user.faculties.all %} + {# Non-humanities faculty known #} +

    {% blocktrans trimmed %} + Deze portal is bedoeld voor medewerkers (en studenten) van de Faculteit Geesteswetenschappen. Volgens onze gegevens werk/studeer je bij de {% endblocktrans %} {{ user.faculties.all|join:',' }}. - {% else %} +

    +

    {% blocktrans trimmed %} - Volgens onze gegevens werk/studeer je bij een andere faculteit of dienst. + Controleer of je inderdaad een aanvraag wilt indienen bij de Facultaire Ethische + Toetsingscommissie van Geesteswetenschappen. Indien dat het geval is kan je de portal + gewoon gebruiken. {% endblocktrans %} - {% endif %} - {% blocktrans trimmed %} - Controleer of je inderdaad een aanvraag wilt indienen bij de Facultaire Ethische Toetsingscommissie van Geesteswetenschappen. - {% endblocktrans %} -

    -

    - {% blocktrans trimmed %} - Als je vermoedt dat dit incorrect is, neem dan contact op met portalsupport.gw@uu.nl. - {% endblocktrans %} -

    +

    +

    + {% blocktrans trimmed %} + Als je vermoedt dat dit incorrect is, neem dan contact op met portalsupport.gw@uu.nl. + {% endblocktrans %} +

    + {% else %} + {# No faculty data #} +

    + {% blocktrans trimmed %} + Wij konden niet verifiëren bij welke faculteit je in dienst bent. Deze portal is bedoeld + voor medewerkers (en studenten) van de Faculteit Geesteswetenschappen. Controleer of je + inderdaad een aanvraag wilt indienen bij de Facultaire Ethische Toetsingscommissie van + Geesteswetenschappen. + {% endblocktrans %} +

    +

    + {% blocktrans trimmed %} + Indien dat het geval is kan je de portal gewoon gebruiken. Voor vragen kan je contact + opnemen met portalsupport.gw@uu.nl. + {% endblocktrans %} +

    + {% endif %}
    {% endif %} From 8544abf0a38ea6d83129d36ac962f02e65fc7896 Mon Sep 17 00:00:00 2001 From: "Mees, T.D. (Ty)" Date: Tue, 18 Jun 2024 15:37:32 +0200 Subject: [PATCH 2/4] refactor: student-inclusive language --- locale/en/LC_MESSAGES/django.po | 10 +++++----- main/templates/main/index.html | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a11280ae3..fde85e33a 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-12 12:01+0200\n" +"POT-Creation-Date: 2024-06-18 15:35+0200\n" "PO-Revision-Date: 2024-04-03 12:32+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -585,13 +585,13 @@ msgstr "" #: main/templates/main/index.html:41 msgid "" -"Wij konden niet verifiëren bij welke faculteit je in dienst bent. Deze " -"portal is bedoeld voor medewerkers (en studenten) van de Faculteit " +"Wij konden niet verifiëren bij welke faculteit je werkt/studeert. Deze " +"portal is bedoeld voor medewerkers en studenten van de Faculteit " "Geesteswetenschappen. Controleer of je inderdaad een aanvraag wilt indienen " "bij de Facultaire Ethische Toetsingscommissie van Geesteswetenschappen." msgstr "" -"We could not verify which faculty you are employed at. This portal is " -"intended for employees (and students) of the Faculty of Humanities. Please " +"We could not verify which faculty you are affiliated with. This portal is " +"intended for employees and students of the Faculty of Humanities. Please " "check if you indeed want to submit an application to the Faculty Ethics " "Assessment Committee of Humanities." diff --git a/main/templates/main/index.html b/main/templates/main/index.html index e2a493cd1..700b6dcbd 100644 --- a/main/templates/main/index.html +++ b/main/templates/main/index.html @@ -39,8 +39,8 @@ {# No faculty data #}

    {% blocktrans trimmed %} - Wij konden niet verifiëren bij welke faculteit je in dienst bent. Deze portal is bedoeld - voor medewerkers (en studenten) van de Faculteit Geesteswetenschappen. Controleer of je + Wij konden niet verifiëren bij welke faculteit je werkt/studeert. Deze portal is bedoeld + voor medewerkers en studenten van de Faculteit Geesteswetenschappen. Controleer of je inderdaad een aanvraag wilt indienen bij de Facultaire Ethische Toetsingscommissie van Geesteswetenschappen. {% endblocktrans %} From daeaf1f69bb1034e40d74a0a47b4b89f49376119 Mon Sep 17 00:00:00 2001 From: Michael Villeneuve Date: Thu, 10 Oct 2024 13:43:57 +0200 Subject: [PATCH 3/4] feat: Well overdue requirements bump (#713) --- requirements.txt | 111 +++++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 57 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0dad18191..6ca7a9572 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile -U +# pip-compile requirements.in # -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt # via -r requirements.in @@ -19,9 +19,9 @@ asn1crypto==1.5.1 # oscrypto # pyhanko # pyhanko-certvalidator -babel==2.14.0 +babel==2.16.0 # via sphinx -black==24.3.0 +black==24.10.0 # via -r requirements.in blessed==1.20.0 # via curtsies @@ -29,11 +29,11 @@ bpython==0.24 # via -r requirements.in cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0 # via -r requirements.in -certifi==2024.2.2 +certifi==2024.8.30 # via # requests # sentry-sdk -cffi==1.16.0 +cffi==1.17.1 # via cryptography chardet==5.2.0 # via reportlab @@ -48,7 +48,7 @@ closure==20191111 # via uil-django-core colorama==0.4.6 # via djlint -cryptography==42.0.5 +cryptography==43.0.1 # via # pyhanko # pyhanko-certvalidator @@ -86,7 +86,7 @@ django==3.2.25 # sentry-sdk # sphinxcontrib-django # uil-django-core -django-auth-ldap==4.7.0 +django-auth-ldap==4.8.0 # via -r requirements.in django-braces==1.15.0 # via -r requirements.in @@ -94,7 +94,7 @@ django-debug-toolbar==4.3.0 # via -r requirements.in django-extensions==3.2.3 # via -r requirements.in -django-impersonate==1.9.2 +django-impersonate==1.9.4 # via -r requirements.in django-modeltranslation==0.18.11 # via -r requirements.in @@ -110,9 +110,9 @@ djangosaml2==1.6.0 # via # -r requirements.in # cdh-django-core -djlint==1.34.1 +djlint==1.35.2 # via -r requirements.in -docutils==0.20.1 +docutils==0.21.2 # via # sphinx # sphinx-rtd-theme @@ -120,9 +120,9 @@ editorconfig==0.12.4 # via # cssbeautifier # jsbeautifier -elementpath==4.4.0 +elementpath==4.5.0 # via xmlschema -greenlet==3.0.3 +greenlet==3.1.1 # via bpython html-tag-names==0.1.2 # via djlint @@ -132,25 +132,25 @@ html5lib==1.1 # via # -r requirements.in # xhtml2pdf -idna==3.6 +idna==3.10 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==7.1.0 +importlib-metadata==8.5.0 # via sphinx -jinja2==3.1.3 +jinja2==3.1.4 # via sphinx jsbeautifier==1.15.1 # via # cssbeautifier # djlint -json5==0.9.24 +json5==0.9.25 # via djlint lesscpy==0.15.1 # via uil-django-core -lxml==5.2.0 +lxml==5.3.0 # via svglib -markupsafe==2.1.5 +markupsafe==3.0.0 # via jinja2 mypy-extensions==1.0.0 # via black @@ -158,7 +158,7 @@ mysqlclient==1.4.6 # via -r requirements.in oscrypto==1.3.0 # via pyhanko-certvalidator -packaging==24.0 +packaging==24.1 # via # black # sphinx @@ -166,16 +166,16 @@ pathspec==0.12.1 # via # black # djlint -pbr==6.0.0 +pbr==6.1.0 # via sphinxcontrib-apidoc pdftotext==2.2.2 # via -r requirements.in -pillow==10.3.0 +pillow==10.4.0 # via # -r requirements.in # reportlab # xhtml2pdf -platformdirs==4.2.0 +platformdirs==4.3.6 # via black ply==3.11 # via lesscpy @@ -183,38 +183,36 @@ pprintpp==0.4.0 # via sphinxcontrib-django pscript==0.7.7 # via vbuild -pyasn1==0.6.0 +pyasn1==0.6.1 # via # pyasn1-modules # python-ldap -pyasn1-modules==0.4.0 +pyasn1-modules==0.4.1 # via python-ldap pycparser==2.22 # via cffi -pygments==2.17.2 +pygments==2.18.0 # via # -r requirements.in # bpython # sphinx -pyhanko==0.23.2 +pyhanko==0.25.1 # via xhtml2pdf pyhanko-certvalidator==0.26.3 # via # pyhanko # xhtml2pdf -pyjwt==2.8.0 +pyjwt==2.9.0 # via uil-django-core -pyopenssl==24.1.0 +pyopenssl==24.2.1 # via pysaml2 -pypdf==4.1.0 +pypdf==5.0.1 # via xhtml2pdf -pypng==0.20220715.0 - # via qrcode pysaml2==7.5.0 # via djangosaml2 pyscss==1.4.0 # via uil-django-core -python-bidi==0.4.2 +python-bidi==0.6.0 # via xhtml2pdf python-dateutil==2.9.0.post0 # via pysaml2 @@ -222,25 +220,25 @@ python-ldap==3.4.4 # via django-auth-ldap python-magic==0.4.27 # via -r requirements.in -pytz==2024.1 +pytz==2024.2 # via # django # pysaml2 pyxdg==0.28 # via bpython -pyyaml==6.0.1 +pyyaml==6.0.2 # via # djlint # pyhanko -qrcode==7.4.2 +qrcode==8.0 # via pyhanko -regex==2023.12.25 +regex==2024.9.11 # via djlint -reportlab==4.0.9 +reportlab==4.2.5 # via # svglib # xhtml2pdf -requests==2.31.0 +requests==2.32.3 # via # -r requirements.in # bpython @@ -249,7 +247,7 @@ requests==2.31.0 # pysaml2 # sphinx # uil-django-core -sentry-sdk[django]==1.44.0 +sentry-sdk[django]==2.16.0 # via -r requirements.in six==1.16.0 # via @@ -258,67 +256,66 @@ six==1.16.0 # html5lib # jsbeautifier # pyscss - # python-bidi # python-dateutil snowballstemmer==2.2.0 # via sphinx -sphinx==7.2.6 +sphinx==7.4.7 # via # -r requirements.in # sphinx-rtd-theme # sphinxcontrib-apidoc # sphinxcontrib-django # sphinxcontrib-jquery -sphinx-rtd-theme==2.0.0 +sphinx-rtd-theme==3.0.0 # via -r requirements.in sphinxcontrib-apidoc==0.5.0 # via -r requirements.in -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==2.0.0 # via sphinx sphinxcontrib-django==2.5 # via -r requirements.in -sphinxcontrib-htmlhelp==2.0.5 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jquery==4.1 # via sphinx-rtd-theme sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.7 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.4.4 +sqlparse==0.5.1 # via # django # django-debug-toolbar svglib==1.5.1 # via xhtml2pdf -tinycss2==1.2.1 +tinycss2==1.3.0 # via # cssselect2 # svglib -tomli==2.0.1 +tomli==2.0.2 # via # black # djlint -tqdm==4.66.2 + # sphinx +tqdm==4.66.5 # via djlint -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via # asgiref # black # django-modeltranslation # pypdf - # qrcode tzlocal==5.2 # via pyhanko ua-parser==0.18.0 # via user-agents -uritools==4.0.2 +uritools==4.0.3 # via pyhanko-certvalidator -urllib3==2.2.1 +urllib3==2.2.3 # via # requests # sentry-sdk @@ -335,9 +332,9 @@ webencodings==0.5.1 # tinycss2 wrapt==1.16.0 # via deprecated -xhtml2pdf==0.2.15 +xhtml2pdf==0.2.16 # via -r requirements.in xmlschema==2.5.1 # via pysaml2 -zipp==3.18.1 +zipp==3.20.2 # via importlib-metadata From 43139be6fe51f34f27623e624ce609756d5a97f6 Mon Sep 17 00:00:00 2001 From: Michael Villeneuve Date: Thu, 19 Dec 2024 11:19:10 +0100 Subject: [PATCH 4/4] chore: Requirements bump (#825) --- requirements.txt | 66 +++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6ca7a9572..355d716fa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,7 +29,7 @@ bpython==0.24 # via -r requirements.in cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0 # via -r requirements.in -certifi==2024.8.30 +certifi==2024.12.14 # via # requests # sentry-sdk @@ -37,7 +37,7 @@ cffi==1.17.1 # via cryptography chardet==5.2.0 # via reportlab -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via @@ -48,7 +48,7 @@ closure==20191111 # via uil-django-core colorama==0.4.6 # via djlint -cryptography==43.0.1 +cryptography==44.0.0 # via # pyhanko # pyhanko-certvalidator @@ -68,7 +68,7 @@ defusedxml==0.7.1 # via # djangosaml2 # pysaml2 -deprecated==1.2.14 +deprecated==1.2.15 # via cdh-django-core django==3.2.25 # via @@ -88,7 +88,7 @@ django==3.2.25 # uil-django-core django-auth-ldap==4.8.0 # via -r requirements.in -django-braces==1.15.0 +django-braces==1.16.0 # via -r requirements.in django-debug-toolbar==4.3.0 # via -r requirements.in @@ -110,24 +110,20 @@ djangosaml2==1.6.0 # via # -r requirements.in # cdh-django-core -djlint==1.35.2 +djlint==1.36.3 # via -r requirements.in docutils==0.21.2 # via # sphinx # sphinx-rtd-theme -editorconfig==0.12.4 +editorconfig==0.17.0 # via # cssbeautifier # jsbeautifier -elementpath==4.5.0 +elementpath==4.6.0 # via xmlschema greenlet==3.1.1 # via bpython -html-tag-names==0.1.2 - # via djlint -html-void-elements==0.1.0 - # via djlint html5lib==1.1 # via # -r requirements.in @@ -144,13 +140,13 @@ jsbeautifier==1.15.1 # via # cssbeautifier # djlint -json5==0.9.25 +json5==0.10.0 # via djlint lesscpy==0.15.1 # via uil-django-core lxml==5.3.0 # via svglib -markupsafe==3.0.0 +markupsafe==3.0.2 # via jinja2 mypy-extensions==1.0.0 # via black @@ -158,7 +154,7 @@ mysqlclient==1.4.6 # via -r requirements.in oscrypto==1.3.0 # via pyhanko-certvalidator -packaging==24.1 +packaging==24.2 # via # black # sphinx @@ -168,9 +164,9 @@ pathspec==0.12.1 # djlint pbr==6.1.0 # via sphinxcontrib-apidoc -pdftotext==2.2.2 +pdftotext==3.0.0 # via -r requirements.in -pillow==10.4.0 +pillow==11.0.0 # via # -r requirements.in # reportlab @@ -196,23 +192,23 @@ pygments==2.18.0 # -r requirements.in # bpython # sphinx -pyhanko==0.25.1 +pyhanko==0.25.3 # via xhtml2pdf -pyhanko-certvalidator==0.26.3 +pyhanko-certvalidator==0.26.5 # via # pyhanko # xhtml2pdf -pyjwt==2.9.0 +pyjwt==2.10.1 # via uil-django-core -pyopenssl==24.2.1 +pyopenssl==24.3.0 # via pysaml2 -pypdf==5.0.1 +pypdf==5.1.0 # via xhtml2pdf pysaml2==7.5.0 # via djangosaml2 pyscss==1.4.0 # via uil-django-core -python-bidi==0.6.0 +python-bidi==0.6.3 # via xhtml2pdf python-dateutil==2.9.0.post0 # via pysaml2 @@ -232,7 +228,7 @@ pyyaml==6.0.2 # pyhanko qrcode==8.0 # via pyhanko -regex==2024.9.11 +regex==2024.11.6 # via djlint reportlab==4.2.5 # via @@ -247,9 +243,9 @@ requests==2.32.3 # pysaml2 # sphinx # uil-django-core -sentry-sdk[django]==2.16.0 +sentry-sdk[django]==2.19.2 # via -r requirements.in -six==1.16.0 +six==1.17.0 # via # blessed # cssbeautifier @@ -266,7 +262,7 @@ sphinx==7.4.7 # sphinxcontrib-apidoc # sphinxcontrib-django # sphinxcontrib-jquery -sphinx-rtd-theme==3.0.0 +sphinx-rtd-theme==3.0.2 # via -r requirements.in sphinxcontrib-apidoc==0.5.0 # via -r requirements.in @@ -286,22 +282,22 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -sqlparse==0.5.1 +sqlparse==0.5.3 # via # django # django-debug-toolbar svglib==1.5.1 # via xhtml2pdf -tinycss2==1.3.0 +tinycss2==1.4.0 # via # cssselect2 # svglib -tomli==2.0.2 +tomli==2.2.1 # via # black # djlint # sphinx -tqdm==4.66.5 +tqdm==4.67.1 # via djlint typing-extensions==4.12.2 # via @@ -311,8 +307,10 @@ typing-extensions==4.12.2 # pypdf tzlocal==5.2 # via pyhanko -ua-parser==0.18.0 +ua-parser==1.0.0 # via user-agents +ua-parser-builtins==0.18.0.post1 + # via ua-parser uritools==4.0.3 # via pyhanko-certvalidator urllib3==2.2.3 @@ -330,11 +328,11 @@ webencodings==0.5.1 # cssselect2 # html5lib # tinycss2 -wrapt==1.16.0 +wrapt==1.17.0 # via deprecated xhtml2pdf==0.2.16 # via -r requirements.in xmlschema==2.5.1 # via pysaml2 -zipp==3.20.2 +zipp==3.21.0 # via importlib-metadata