From dc56696d39f643431584f1c5eb2735a82207456c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 06:17:20 +0000 Subject: [PATCH 1/9] Bump pyyaml from 5.4 to 6.0.1 Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.4 to 6.0.1. - [Changelog](https://github.com/yaml/pyyaml/blob/6.0.1/CHANGES) - [Commits](https://github.com/yaml/pyyaml/compare/5.4...6.0.1) --- updated-dependencies: - dependency-name: pyyaml dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-prd.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-prd.txt b/requirements-prd.txt index d258725f3..beb8e5e23 100644 --- a/requirements-prd.txt +++ b/requirements-prd.txt @@ -10,7 +10,7 @@ django-phonenumber-field==2.0.0 phonenumbers==8.12.9 beautifulsoup4==4.8.2 feedparser==6.0.1 -pyyaml==5.4 +pyyaml==6.0.1 ua-parser==0.10.0 user-agents==2.2.0 django-user_agents==0.4.0 diff --git a/requirements.txt b/requirements.txt index 2b820d89d..b241b9700 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ django-phonenumber-field==2.0.0 phonenumbers==8.12.9 beautifulsoup4==4.8.2 feedparser==6.0.1 -pyyaml==5.4 +pyyaml==6.0.1 ua-parser==0.10.0 user-agents==2.2.0 django-user_agents==0.4.0 From 95b320c9f82e6786b276314ae3208e4385cce71e Mon Sep 17 00:00:00 2001 From: tubbdoose Date: Fri, 29 Sep 2023 01:59:37 +0000 Subject: [PATCH 2/9] Changed byline in author_pinned --- article/templates/article/objects/author_pinned.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/article/templates/article/objects/author_pinned.html b/article/templates/article/objects/author_pinned.html index 29c1b5f54..48d2b7cd0 100644 --- a/article/templates/article/objects/author_pinned.html +++ b/article/templates/article/objects/author_pinned.html @@ -1,6 +1,8 @@ {% load video_filters %} {% load wagtailcore_tags %} {% load wagtailimages_tags %} +{% load articletags %} + {% load humanize %}
@@ -23,8 +25,8 @@

{{ article.lede|safe }}

{{ article.get_authors_with_urls|safe }} -    - {{ article.explicit_published_at|naturalday }} +  •  + {{ article.explicit_published_at|display_pubdate }}
From 5a9a6ab5aab8e20edfb8d168dfedfa513f0a87f4 Mon Sep 17 00:00:00 2001 From: Peter Siemens Date: Fri, 29 Sep 2023 15:30:38 -0700 Subject: [PATCH 3/9] Remove obsolete GS_USE_SIGNED_URLS setting --- config/settings/base.py | 1 - config/settings/production.py | 1 - 2 files changed, 2 deletions(-) diff --git a/config/settings/base.py b/config/settings/base.py index 6a87858be..30e877102 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -291,7 +291,6 @@ GS_LOCATION = None GS_STORAGE_BUCKET_NAME = None # See documentation https://django-storages.readthedocs.io/en/latest/backends/gcloud.html -GS_USE_SIGNED_URLS = False PHONENUMBER_DB_FORMAT = 'NATIONAL' PHONENUMBER_DEFAULT_REGION = 'CA' diff --git a/config/settings/production.py b/config/settings/production.py index b85bfc4ce..926048c68 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -47,7 +47,6 @@ GS_STORAGE_BUCKET_NAME = 'ubyssey' # See documentation https://django-storages.readthedocs.io/en/latest/backends/gcloud.html GS_BUCKET_NAME = GS_STORAGE_BUCKET_NAME # https://github.com/mirumee/saleor/issues/5222 see suggestion both these variables are needed GS_LOCATION = 'media' -GS_USE_SIGNED_URLS = True GS_QUERYSTRING_AUTH = False GS_FILE_OVERWRITE = False From d6d77dab5606a8ca6ebe5e64ceec1a009457fd4e Mon Sep 17 00:00:00 2001 From: Peter Siemens Date: Fri, 29 Sep 2023 15:31:08 -0700 Subject: [PATCH 4/9] Remove unneeded Google Cloud Storage libraries --- requirements-prd.txt | 2 -- requirements.txt | 2 -- 2 files changed, 4 deletions(-) diff --git a/requirements-prd.txt b/requirements-prd.txt index 0f6365237..d00e6dcc0 100644 --- a/requirements-prd.txt +++ b/requirements-prd.txt @@ -1,6 +1,5 @@ Django==3.2.11 wagtail==2.15.3 -git+https://github.com/ubyssey/django-google-storage.git@v0.5.4#egg=django-google-storage-updated django-storages[google]==1.10 django-canonical-domain==0.3.0 pymemcache==3.5.0 @@ -16,7 +15,6 @@ django-user_agents==0.4.0 gunicorn==20.0.4 Pillow==9.3.0 google-cloud-datastore==1.15.0 -google-cloud-storage==1.31.0 google-cloud-secret-manager==1.0.0 django-environ==0.4.5 requests==2.24.0 diff --git a/requirements.txt b/requirements.txt index 1b2d53b71..e3b472326 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ Django==3.2.11 wagtail==2.15.3 -git+https://github.com/ubyssey/django-google-storage.git@v0.5.4#egg=django-google-storage-updated django-storages[google]==1.10 django-canonical-domain==0.3.0 pymemcache==3.5.0 @@ -16,7 +15,6 @@ django-user_agents==0.4.0 gunicorn==20.0.4 Pillow==9.3.0 google-cloud-datastore==1.15.0 -google-cloud-storage==1.31.0 google-cloud-secret-manager==2.11.0 django-environ==0.4.5 requests==2.24.0 From 171f47c8998272e34aad57705badea5211033c32 Mon Sep 17 00:00:00 2001 From: Peter Siemens Date: Fri, 29 Sep 2023 15:32:00 -0700 Subject: [PATCH 5/9] Upgrade django-storages to v1.12 This is needed to be able to disable signed URLs in the site configuration --- requirements-prd.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-prd.txt b/requirements-prd.txt index d00e6dcc0..5d421a8cd 100644 --- a/requirements-prd.txt +++ b/requirements-prd.txt @@ -1,6 +1,6 @@ Django==3.2.11 wagtail==2.15.3 -django-storages[google]==1.10 +django-storages[google]==1.12 django-canonical-domain==0.3.0 pymemcache==3.5.0 mysqlclient==2.0.1 diff --git a/requirements.txt b/requirements.txt index e3b472326..e0f69c573 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ Django==3.2.11 wagtail==2.15.3 -django-storages[google]==1.10 +django-storages[google]==1.12 django-canonical-domain==0.3.0 pymemcache==3.5.0 mysqlclient==2.0.1 From 5def852db2e779a1147e0ce174db712ca5bd36ba Mon Sep 17 00:00:00 2001 From: Peter Siemens Date: Mon, 2 Oct 2023 11:31:13 -0700 Subject: [PATCH 6/9] Remove GS_STORAGE_BUCKET_NAME config variable --- config/settings/production.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/settings/production.py b/config/settings/production.py index 926048c68..9dfb64c8c 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -44,8 +44,7 @@ GS_SECRET_ACCESS_KEY = env('GS_SECRET_ACCESS_KEY') # GS_CREDENTIALS = service_account.Credentials.from_service_account_file('ubyssey-prd-ee6290e6327f.json') # GS_CREDENTIALS = env('GOOGLE_APPLICATION_CREDENTIALS') -GS_STORAGE_BUCKET_NAME = 'ubyssey' # See documentation https://django-storages.readthedocs.io/en/latest/backends/gcloud.html -GS_BUCKET_NAME = GS_STORAGE_BUCKET_NAME # https://github.com/mirumee/saleor/issues/5222 see suggestion both these variables are needed +GS_BUCKET_NAME = 'ubyssey' GS_LOCATION = 'media' GS_QUERYSTRING_AUTH = False GS_FILE_OVERWRITE = False From c50ff08b4406c0f52f84bb3bb713e919c8155286 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 20:52:32 +0000 Subject: [PATCH 7/9] Bump pillow from 9.3.0 to 10.0.1 Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 10.0.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/9.3.0...10.0.1) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements-prd.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-prd.txt b/requirements-prd.txt index 5d421a8cd..4e339ea34 100644 --- a/requirements-prd.txt +++ b/requirements-prd.txt @@ -13,7 +13,7 @@ ua-parser==0.10.0 user-agents==2.2.0 django-user_agents==0.4.0 gunicorn==20.0.4 -Pillow==9.3.0 +Pillow==10.0.1 google-cloud-datastore==1.15.0 google-cloud-secret-manager==1.0.0 django-environ==0.4.5 diff --git a/requirements.txt b/requirements.txt index e0f69c573..2bba0af95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ ua-parser==0.10.0 user-agents==2.2.0 django-user_agents==0.4.0 gunicorn==20.0.4 -Pillow==9.3.0 +Pillow==10.0.1 google-cloud-datastore==1.15.0 google-cloud-secret-manager==2.11.0 django-environ==0.4.5 From f048112ae73d9f4f2375739e340e94baabedbc02 Mon Sep 17 00:00:00 2001 From: TubbDoose <67992154+SamuelmdLow@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:07:14 -0700 Subject: [PATCH 8/9] Update requirements.txt went back to Pillow 9.3.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9d4d3e648..83e5c4aa1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ ua-parser==0.10.0 user-agents==2.2.0 django-user_agents==0.4.0 gunicorn==20.0.4 -Pillow==10.0.1 +Pillow==9.3.0 google-cloud-datastore==1.15.0 google-cloud-secret-manager==2.11.0 django-environ==0.4.5 From 74205ba5cf42ad9256cbecf85e4b310d3e8a627b Mon Sep 17 00:00:00 2001 From: TubbDoose <67992154+SamuelmdLow@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:08:13 -0700 Subject: [PATCH 9/9] Update requirements-prd.txt --- requirements-prd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-prd.txt b/requirements-prd.txt index eb743113c..8e4f11bc8 100644 --- a/requirements-prd.txt +++ b/requirements-prd.txt @@ -13,7 +13,7 @@ ua-parser==0.10.0 user-agents==2.2.0 django-user_agents==0.4.0 gunicorn==20.0.4 -Pillow==10.0.1 +Pillow==9.3.0 google-cloud-datastore==1.15.0 google-cloud-secret-manager==1.0.0 django-environ==0.4.5