From 73aa4258aceca35f8f1db9275f24e0dbb68227f0 Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Thu, 31 Oct 2024 14:12:30 +0000 Subject: [PATCH 1/3] Bumped waitress --- requirements.in | 2 +- requirements.txt | 8 ++++---- requirements_test.txt | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.in b/requirements.in index d2b08bc4..523ffeb5 100644 --- a/requirements.in +++ b/requirements.in @@ -24,7 +24,7 @@ requests[security]>=2.32.0 sentry-sdk>=1.20.0.a,<3.0.0 sorl-thumbnail==12.9.0 urllib3>=1.26.19,<2.0.0 -waitress==2.1.2 +waitress==3.0.1 whitenoise==6.4.0 gunicorn==22.0.0 psycogreen==1.0.2 diff --git a/requirements.txt b/requirements.txt index 0acc4263..14cb22bd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ asgiref==3.8.1 # via # django # django-countries -async-timeout==4.0.3 +async-timeout==5.0.0 # via redis attrs==24.2.0 # via jsonschema @@ -151,7 +151,7 @@ pytz==2023.3 # via # dateparser # directory-validators -redis==5.1.1 +redis==5.2.0 # via django-redis regex==2022.1.18 # via @@ -198,13 +198,13 @@ urllib3==1.26.20 # sentry-sdk w3lib==1.22.0 # via directory-client-core -waitress==2.1.2 +waitress==3.0.1 # via -r requirements.in whitenoise==6.4.0 # via -r requirements.in zope-event==5.0 # via gevent -zope-interface==7.1.0 +zope-interface==7.1.1 # via gevent # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements_test.txt b/requirements_test.txt index 2ba2fb7a..158fee56 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -8,7 +8,7 @@ asgiref==3.8.1 # via # django # django-countries -async-timeout==4.0.3 +async-timeout==5.0.0 # via redis attrs==24.2.0 # via jsonschema @@ -200,7 +200,7 @@ pytest==8.3.3 # pytest-xdist pytest-codecov==0.6.0 # via -r requirements_test.in -pytest-cov==5.0.0 +pytest-cov==6.0.0 # via # -r requirements_test.in # pytest-codecov @@ -223,7 +223,7 @@ pytz==2023.3 # via # dateparser # directory-validators -redis==5.1.1 +redis==5.2.0 # via django-redis regex==2022.1.18 # via @@ -285,7 +285,7 @@ urllib3==1.26.20 # sentry-sdk w3lib==1.22.0 # via directory-client-core -waitress==2.1.2 +waitress==3.0.1 # via -r requirements.in wheel==0.44.0 # via pip-tools @@ -295,7 +295,7 @@ zipp==3.20.2 # via importlib-metadata zope-event==5.0 # via gevent -zope-interface==7.1.0 +zope-interface==7.1.1 # via gevent # The following packages are considered to be unsafe in a requirements file: From ba931a02a69ff14db578267f3fce08af27f078bf Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 1 Nov 2024 09:49:19 +0000 Subject: [PATCH 2/3] roll back changes to waitress --- requirements.in | 2 +- requirements.txt | 2 +- requirements_test.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 523ffeb5..d2b08bc4 100644 --- a/requirements.in +++ b/requirements.in @@ -24,7 +24,7 @@ requests[security]>=2.32.0 sentry-sdk>=1.20.0.a,<3.0.0 sorl-thumbnail==12.9.0 urllib3>=1.26.19,<2.0.0 -waitress==3.0.1 +waitress==2.1.2 whitenoise==6.4.0 gunicorn==22.0.0 psycogreen==1.0.2 diff --git a/requirements.txt b/requirements.txt index 14cb22bd..4209f9c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -198,7 +198,7 @@ urllib3==1.26.20 # sentry-sdk w3lib==1.22.0 # via directory-client-core -waitress==3.0.1 +waitress==2.1.2 # via -r requirements.in whitenoise==6.4.0 # via -r requirements.in diff --git a/requirements_test.txt b/requirements_test.txt index 158fee56..9742a0c0 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -285,7 +285,7 @@ urllib3==1.26.20 # sentry-sdk w3lib==1.22.0 # via directory-client-core -waitress==3.0.1 +waitress==2.1.2 # via -r requirements.in wheel==0.44.0 # via pip-tools From fb02ee2be5d6550a023b3534b52e9f619def8c0e Mon Sep 17 00:00:00 2001 From: davidu1975 Date: Fri, 1 Nov 2024 14:18:23 +0000 Subject: [PATCH 3/3] remove blank line in hreflang tag --- core/templates/core/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/core/base.html b/core/templates/core/base.html index ec2ede14..8e641d9b 100644 --- a/core/templates/core/base.html +++ b/core/templates/core/base.html @@ -55,7 +55,7 @@ {% get_canonical_url as canonical_url %} {% get_hreflang_tags as hreflang_tags %} - {{ hreflang_tags|linebreaksbr }} + {{ hreflang_tags }} {% endblock %}