Merge branch 'develop' of https://github.com/ubyssey/ubyssey.ca into …

…redesign-latest
ubyssey · Oct 12, 2023 · bbe4af4 · bbe4af4
2 parents d69a67d + 0b34ab8
commit bbe4af4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git 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 %}
 
 <article class="o-article o-article--author_pinned{% if padded %} o-article--padded{% endif %}">
@@ -23,8 +25,8 @@ <h3 class="o-article__headline">
       <p class="o-article__snippet">{{ article.lede|safe }}</p>
       <div class="o-article__byline">
         <span class="o-article__author">{{ article.get_authors_with_urls|safe }}</span>
-        <span> &nbsp;&nbsp; </span>
-        <span class="o-article__published">{{ article.explicit_published_at|naturalday }}</span>
+        <span> &nbsp;&bullet;&nbsp; </span>
+        <span class="o-article__published">{{ article.explicit_published_at|display_pubdate }}</span>
       </div>
     </div>
   </div>

diff --git 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
@@ -44,10 +44,8 @@
 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_USE_SIGNED_URLS = True
 GS_QUERYSTRING_AUTH = False
 GS_FILE_OVERWRITE = False
 

diff --git a/requirements-prd.txt b/requirements-prd.txt
@@ -1,22 +1,20 @@
 Django==3.2.11
 wagtail==2.15.3
-git+https://github.com/ubyssey/[email protected]#egg=django-google-storage-updated
-django-storages[google]==1.10
+django-storages[google]==1.12
 django-canonical-domain==0.3.0
 pymemcache==3.5.0
 mysqlclient==2.0.1
 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
 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
@@ -1,22 +1,20 @@
 Django==3.2.11
 wagtail==2.15.3
-git+https://github.com/ubyssey/[email protected]#egg=django-google-storage-updated
-django-storages[google]==1.10
+django-storages[google]==1.12
 django-canonical-domain==0.3.0
 pymemcache==3.5.0
 mysqlclient==2.0.1
 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
 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