From 25a04a76671368de0664d111a535b5ffeafe0cc3 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Thu, 22 Feb 2024 10:23:02 +0100 Subject: [PATCH 1/4] :heavy_minus_sign: Remove unused dependencies --- .watchmanconfig | 3 --- requirements/base.in | 5 ----- requirements/base.txt | 14 -------------- requirements/ci.txt | 29 ++--------------------------- requirements/dev.txt | 19 ------------------- src/open_inwoner/conf/base.py | 1 - 6 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 .watchmanconfig diff --git a/.watchmanconfig b/.watchmanconfig deleted file mode 100644 index cd44f95b14..0000000000 --- a/.watchmanconfig +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ignore_dirs": ["node_modules"] -} diff --git a/requirements/base.in b/requirements/base.in index 5b3f04c4ac..5b1cf8d5d3 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -8,7 +8,6 @@ geopy # geo decoder glom # processing nested data furl # processing urls weasyprint # export to pdf -pywatchman tinycss2 css_inline @@ -19,7 +18,6 @@ django-axes django-filer django-ordered-model django-redis -django-rosetta django-sniplates django-treebeard maykin-2fa @@ -38,7 +36,6 @@ markdown django_better_admin_arrayfield humanfriendly git+https://github.com/maykinmedia/mail-editor.git@0.3.5#egg=mail-editor -fontawesomefree django-timeline-logger django-csp django-csp-reports @@ -75,8 +72,6 @@ uwsgi sentry-sdk # error monitoring elastic-apm # Elastic APM integration -beautifulsoup4 - # DigidLocal django-digid-eherkenning maykin-python3-saml diff --git a/requirements/base.txt b/requirements/base.txt index 8ce6cf10cd..e6f8d9d8a8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -18,8 +18,6 @@ attrs==21.2.0 # via # glom # jsonschema -beautifulsoup4==4.10.0 - # via -r requirements/base.in billiard==3.6.4.0 # via celery boltons==21.0.0 @@ -111,7 +109,6 @@ django==3.2.23 # django-redis # django-registration # django-relativedelta - # django-rosetta # django-sekizai # django-sendfile2 # django-simple-certmanager @@ -225,8 +222,6 @@ django-registration==3.2 # via -r requirements/base.in django-relativedelta==2.0.0 # via zgw-consumers -django-rosetta==0.9.7 - # via -r requirements/base.in django-sekizai==4.0.0 # via django-cms django-sendfile2==0.7.0 @@ -306,8 +301,6 @@ et-xmlfile==1.1.0 # via openpyxl face==20.1.1 # via glom -fontawesomefree==6.4.2 - # via -r requirements/base.in fonttools[woff]==4.29.1 # via # fonttools @@ -403,8 +396,6 @@ pillow==10.1.0 # weasyprint playwright==1.41.0 # via -r requirements/base.in -polib==1.1.1 - # via django-rosetta prompt-toolkit==3.0.36 # via click-repl psycopg2==2.9.9 @@ -448,8 +439,6 @@ pytz==2021.3 # celery # django # django-yubin -pywatchman==1.4.1 - # via -r requirements/base.in pyyaml==6.0 # via # drf-spectacular @@ -468,7 +457,6 @@ requests==2.31.0 # ape-pie # django-log-outgoing-requests # django-open-forms-client - # django-rosetta # gemma-zds-client # mail-editor # maykin-python3-saml @@ -492,8 +480,6 @@ six==1.16.0 # orderedmultidict # python-dateutil # qrcode -soupsieve==2.3.1 - # via beautifulsoup4 sqlparse==0.4.4 # via django svglib==1.5.1 diff --git a/requirements/ci.txt b/requirements/ci.txt index 984b216479..86b9c32a0d 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -37,10 +37,7 @@ attrs==21.2.0 # glom # jsonschema beautifulsoup4==4.10.0 - # via - # -c requirements/base.txt - # -r requirements/base.txt - # webtest + # via webtest billiard==3.6.4.0 # via # -c requirements/base.txt @@ -187,7 +184,6 @@ django==3.2.23 # django-redis # django-registration # django-relativedelta - # django-rosetta # django-sekizai # django-sendfile2 # django-simple-certmanager @@ -377,10 +373,6 @@ django-relativedelta==2.0.0 # -c requirements/base.txt # -r requirements/base.txt # zgw-consumers -django-rosetta==0.9.7 - # via - # -c requirements/base.txt - # -r requirements/base.txt django-sekizai==4.0.0 # via # -c requirements/base.txt @@ -528,10 +520,6 @@ faker==9.9.0 # via factory-boy flake8==3.9.2 # via -r requirements/test-tools.in -fontawesomefree==6.4.2 - # via - # -c requirements/base.txt - # -r requirements/base.txt fonttools[woff]==4.29.1 # via # -c requirements/base.txt @@ -735,11 +723,6 @@ playwright==1.41.0 # via # -c requirements/base.txt # -r requirements/base.txt -polib==1.1.1 - # via - # -c requirements/base.txt - # -r requirements/base.txt - # django-rosetta prompt-toolkit==3.0.36 # via # -c requirements/base.txt @@ -827,10 +810,6 @@ pytz==2021.3 # celery # django # django-yubin -pywatchman==1.4.1 - # via - # -c requirements/base.txt - # -r requirements/base.txt pyyaml==6.0 # via # -c requirements/base.txt @@ -861,7 +840,6 @@ requests==2.31.0 # ape-pie # django-log-outgoing-requests # django-open-forms-client - # django-rosetta # gemma-zds-client # mail-editor # maykin-python3-saml @@ -897,10 +875,7 @@ six==1.16.0 # qrcode # requests-mock soupsieve==2.3.1 - # via - # -c requirements/base.txt - # -r requirements/base.txt - # beautifulsoup4 + # via beautifulsoup4 sqlparse==0.4.4 # via # -c requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 6c7c86867d..b501047d1e 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -223,7 +223,6 @@ django==3.2.23 # django-redis # django-registration # django-relativedelta - # django-rosetta # django-sekizai # django-sendfile2 # django-silk @@ -418,10 +417,6 @@ django-relativedelta==2.0.0 # -c requirements/ci.txt # -r requirements/ci.txt # zgw-consumers -django-rosetta==0.9.7 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt django-sekizai==4.0.0 # via # -c requirements/ci.txt @@ -593,10 +588,6 @@ flask-basicauth==0.2.0 # via locust flask-cors==4.0.0 # via locust -fontawesomefree==6.4.2 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt fonttools[woff]==4.29.1 # via # -c requirements/ci.txt @@ -855,11 +846,6 @@ playwright==1.41.0 # via # -c requirements/ci.txt # -r requirements/ci.txt -polib==1.1.1 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt - # django-rosetta prompt-toolkit==3.0.36 # via # -c requirements/ci.txt @@ -962,10 +948,6 @@ pytz==2021.3 # celery # django # django-yubin -pywatchman==1.4.1 - # via - # -c requirements/ci.txt - # -r requirements/ci.txt pyyaml==6.0 # via # -c requirements/ci.txt @@ -1000,7 +982,6 @@ requests==2.31.0 # ddt-api-calls # django-log-outgoing-requests # django-open-forms-client - # django-rosetta # gemma-zds-client # locust # mail-editor diff --git a/src/open_inwoner/conf/base.py b/src/open_inwoner/conf/base.py index bae151d9cd..8edee781e0 100644 --- a/src/open_inwoner/conf/base.py +++ b/src/open_inwoner/conf/base.py @@ -185,7 +185,6 @@ "mail_editor", "ckeditor", "privates", - "fontawesomefree", "timeline_logger", "csp", "cspreports", From 660f609468350d5586ba69f4b75fbaf49e838a2e Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Thu, 22 Feb 2024 10:26:07 +0100 Subject: [PATCH 2/4] :arrow_up: Upgrade Pillow to 10.2.0 --- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index e6f8d9d8a8..8b5103ccf1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -387,7 +387,7 @@ phonenumbers==8.13.29 # via -r requirements/base.in phonenumberslite==8.13.29 # via django-two-factor-auth -pillow==10.1.0 +pillow==10.2.0 # via # -r requirements/base.in # djangocms-text-ckeditor diff --git a/requirements/ci.txt b/requirements/ci.txt index 86b9c32a0d..5b944e396e 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -707,7 +707,7 @@ phonenumberslite==8.13.29 # -c requirements/base.txt # -r requirements/base.txt # django-two-factor-auth -pillow==10.1.0 +pillow==10.2.0 # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index b501047d1e..92f2af4edc 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -826,7 +826,7 @@ phonenumberslite==8.13.29 # -c requirements/ci.txt # -r requirements/ci.txt # django-two-factor-auth -pillow==10.1.0 +pillow==10.2.0 # via # -c requirements/ci.txt # -r requirements/ci.txt From 9fc7c4c6222dd5681d0ff2ede34b3d7a3995953b Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Thu, 22 Feb 2024 10:29:25 +0100 Subject: [PATCH 3/4] :arrow_up: Upgrade Django to 3.2.24 --- requirements/base.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 8b5103ccf1..0767b50432 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -79,7 +79,7 @@ defusedxml==0.7.1 # odfpy diff-match-patch==20200713 # via django-import-export -django==3.2.23 +django==3.2.24 # via # -r requirements/base.in # django-admin-index diff --git a/requirements/ci.txt b/requirements/ci.txt index 5b944e396e..f0258d1d7d 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -153,7 +153,7 @@ diff-match-patch==20200713 # django-import-export dill==0.3.7 # via pylint -django==3.2.23 +django==3.2.24 # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index 92f2af4edc..c359638e76 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -189,7 +189,7 @@ dill==0.3.7 # -c requirements/ci.txt # -r requirements/ci.txt # pylint -django==3.2.23 +django==3.2.24 # via # -c requirements/ci.txt # -r requirements/ci.txt From 4310ed146fb8098cfe2b96be1f25bf1401d5fd10 Mon Sep 17 00:00:00 2001 From: Steven Bal Date: Fri, 23 Feb 2024 11:28:36 +0100 Subject: [PATCH 4/4] :arrow_up: Upgrade cbor2 to 5.6.2 and fonttools to 4.43.0 --- requirements/base.txt | 4 ++-- requirements/ci.txt | 4 ++-- requirements/dev.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 0767b50432..9c7b9e800c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -26,7 +26,7 @@ boltons==21.0.0 # glom brotli==1.0.9 # via fonttools -cbor2==5.6.0 +cbor2==5.6.2 # via webauthn celery==5.2.7 # via notifications-api-common @@ -301,7 +301,7 @@ et-xmlfile==1.1.0 # via openpyxl face==20.1.1 # via glom -fonttools[woff]==4.29.1 +fonttools[woff]==4.43.0 # via # fonttools # weasyprint diff --git a/requirements/ci.txt b/requirements/ci.txt index f0258d1d7d..3ffab0c0b3 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -56,7 +56,7 @@ brotli==1.0.9 # -c requirements/base.txt # -r requirements/base.txt # fonttools -cbor2==5.6.0 +cbor2==5.6.2 # via # -c requirements/base.txt # -r requirements/base.txt @@ -520,7 +520,7 @@ faker==9.9.0 # via factory-boy flake8==3.9.2 # via -r requirements/test-tools.in -fonttools[woff]==4.29.1 +fonttools[woff]==4.43.0 # via # -c requirements/base.txt # -r requirements/base.txt diff --git a/requirements/dev.txt b/requirements/dev.txt index c359638e76..ed7ea87300 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -77,7 +77,7 @@ brotli==1.0.9 # geventhttpclient build==0.8.0 # via pip-tools -cbor2==5.6.0 +cbor2==5.6.2 # via # -c requirements/ci.txt # -r requirements/ci.txt @@ -588,7 +588,7 @@ flask-basicauth==0.2.0 # via locust flask-cors==4.0.0 # via locust -fonttools[woff]==4.29.1 +fonttools[woff]==4.43.0 # via # -c requirements/ci.txt # -r requirements/ci.txt