Update packages nishim

.github/workflows/deploy-production.yml

@@ -88,7 +88,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.12'
 
       - name: Install Python dependencies
         run: python -m pip install -r requirements.txt
@@ -204,12 +204,12 @@ jobs:
           MAX_ATTEMPTS=15
           for ((i=1; i<=MAX_ATTEMPTS; i++)); do
             echo "Health check attempt $i/$MAX_ATTEMPTS..."
-            if ssh production "curl -f https://ubyssey.ca/health/" >/dev/null 2>&1; then
-              echo "Health check passed"
+            if ssh production "curl -f -s -o /dev/null -w '%{http_code}' https://ubyssey.ca/ | grep -q '200\|301\|302'" 2>/dev/null; then
+              echo "Health check passed - homepage is accessible"
               exit 0
             else
               echo "Attempt $i failed - showing error details:"
-              ssh production "curl -f https://ubyssey.ca/health/"
+              ssh production "curl -I https://ubyssey.ca/"
             fi
             sleep 10
           done

.github/workflows/deploy-staging.yml

@@ -3,7 +3,7 @@ name: Deploy to staging
 on:
   push:
     branches:
-      - force-update-docker-container
+      - update-packages-nishim
 
 env:
   REGISTRY: ghcr.io
@@ -83,7 +83,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.12'
 
       - name: Install Python dependencies
         run: python -m pip install -r requirements.txt

config/settings/base.py

@@ -129,9 +129,6 @@ def read_file(filename):
     'wagtailmenus',
     'wagtailcache',
     'wagtail_color_panel',
-    'health_check',                    
-    'health_check.db',                 
-    'health_check.cache',              
 ]
 
 if DEBUG:
@@ -272,7 +269,7 @@ def read_file(filename):
 # https://docs.djangoproject.com/en/4.2/topics/i18n/
 
 USE_TZ = True
-TIME_ZONE = 'Canada/Pacific'
+TIME_ZONE = 'America/Vancouver'
 
 # Wagtail settings
 # Ref: https://docs.wagtail.org/en/stable/reference/settings.html

deployment/compose/docker-compose.staging.yml

@@ -71,7 +71,7 @@ services:
       SQL_DATABASE: ubyssey
       GS_ACCESS_KEY_ID_FILE: /run/secrets/GS_ACCESS_KEY_ID
       GS_SECRET_ACCESS_KEY_FILE: /run/secrets/GS_SECRET_ACCESS_KEY
-      STATIC_URL: https://storage.googleapis.com/ubyssey/static/
+      STATIC_URL: https://storage.googleapis.com/ubyssey-staging/static/
       GOOGLE_APPLICATION_CREDENTIALS: /run/secrets/GOOGLE_APPLICATION_CREDENTIALS
       EMAIL_HOST_PASSWORD_FILE: /run/secrets/EMAIL_HOST_PASSWORD
 
@@ -156,7 +156,7 @@ services:
       SQL_DATABASE: ubyssey
       GS_ACCESS_KEY_ID_FILE: /run/secrets/GS_ACCESS_KEY_ID
       GS_SECRET_ACCESS_KEY_FILE: /run/secrets/GS_SECRET_ACCESS_KEY
-      STATIC_URL: https://storage.googleapis.com/ubyssey/static/
+      STATIC_URL: https://storage.googleapis.com/ubyssey-staging/static/
       GOOGLE_APPLICATION_CREDENTIALS: /run/secrets/GOOGLE_APPLICATION_CREDENTIALS
       EMAIL_HOST_PASSWORD_FILE: /run/secrets/EMAIL_HOST_PASSWORD
 

deployment/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10-bullseye
+FROM python:3.12
 
 COPY . /app
 WORKDIR /app

requirements-prd.txt

@@ -11,6 +11,7 @@ daphne==4.2.1
 pymemcache==4.0.0
 mysqlclient==2.2.6
 beautifulsoup4==4.11.2
+html5lib==1.1
 feedparser==6.0.10
 pyyaml==6.0.1
 ua-parser==0.10.0

requirements.txt

@@ -1,16 +1,18 @@
-Django==4.2.0
-wagtail==5.2.7
+Django==5.2.0
+setuptools>=69.0.0
+wagtail==7.0
 git+https://github.com/ubyssey/django-google-storage.git@v0.5.4#egg=django-google-storage-updated
 django-storages[google]==1.14.2
 django-canonical-domain==0.3.0
-django-taggit==4.0.0
+django-taggit==6.0.0
 django-crontab==0.7.1
 channels==4.3.2
 channels_redis==4.3.0
 daphne==4.2.1
 pymemcache==4.0.0
 mysqlclient==2.2.6
 beautifulsoup4==4.11.2
+html5lib==1.1
 feedparser==6.0.10
 pyyaml==6.0.1
 ua-parser==0.10.0
@@ -20,7 +22,7 @@ gunicorn==21.2.0
 uvicorn
 Pillow==10.4.*
 google-cloud-datastore==2.17.0
-google-cloud-storage==1.44.0
+google-cloud-storage>=2.10.0
 google-cloud-secret-manager==2.11.0
 django-environ==0.10.0
 requests==2.31.0
@@ -30,9 +32,9 @@ django-extensions==3.2.3
 git+https://github.com/jazzband/django-dbtemplates.git@ac740e0#egg=django-dbtemplates
 wagtail-modelchooser==4.0.1
 wagtailmenus==4.0.0
-wagtail-cache==2.3.0
+wagtail-cache==3.0.0
 google-crc32c==1.3.0
-wagtail-color-panel==1.4.0
+wagtail-color-panel==1.7.1
 django-debug-toolbar==4.2.0
 pylint==2.17.5
 pylint-django==2.5.3
@@ -45,6 +47,5 @@ icalendar===6.3.1
 selenium===4.23.1
 aiohttp===3.10.3
 python-json-logger==2.0.7
-django-health-check>=3.17.0
 
 django-db-connection-pool==1.2.6

ubyssey/urls.py

@@ -130,7 +130,7 @@
     re_path(r'^authors/(?P<slug>[-\w]+)/rss/$', AuthorFeed(), name='author-feed'),
     re_path(r'^blog/', redirect_blog_to_humour),
     re_path(r'^sitemap.xml$', sitemap),
-    re_path(r'^health/', include('health_check.urls')),
+    # re_path(r'^health/', include('health_check.urls')),  # Removed - not needed
     path('', include(wagtail_urls)),
     # # standard Ubyssey site
     # re_path(r'^$', HomePageView.as_view(), name='home'),

ubyssey/validators.py

@@ -27,7 +27,7 @@ def validate_colour_hex(value):
             params={'value': value},
         )
 def validate_youtube_url(value):
-    """
+    r"""
     Matches value against the regular expression:
     (https?://)?(www\.)?(youtube|youtu|youtube-nocookie)\.(com|be)/(watch\?v=|embed/|v/|.+\?v=)?(?P<id>[A-Za-z0-9\-=_]{11})