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

…align-coverstory-samlow

.github/workflows/super-linter.yml

@@ -0,0 +1,29 @@
+# This workflow executes several linters on changed files based on languages used in your code base whenever
+# you push a code or open a pull request.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/github/super-linter
+name: Lint Code Base
+
+on:
+ push:
+ branches: [ "develop" ]
+ pull_request:
+ branches: [ "develop" ]
+jobs:
+ run-lint:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v3
+ with:
+ # Full git history is needed to get a proper list of changed files within `super-linter`
+ fetch-depth: 0
+
+ - name: Lint Code Base
+ uses: github/super-linter@v4
+ env:
+ VALIDATE_ALL_CODEBASE: false
+ DEFAULT_BRANCH: "develop"
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -16,6 +16,7 @@ __pycache__/
 /localdev/
 /tmp/
 /cache/
+/bin/
 
 # swap files
 *.swp
@@ -26,15 +27,18 @@ __pycache__/
 node_modules/
 yarn.lock
 
-# Ignore Mac specific empty file
+# Ignore macOS-specific empty file
 .DS_Store
 
-# Ignore settings for vscode except extensions.json
+# Ignore settings for VS Code except extensions.json
 .vscode
 
-ubyssey/settings*.py
-
 # Client secret for Travis
 client-secret.json
-# Keyfile for accessing gcs bucket
+
+# Keyfile for accessing GCS bucket
 gcs-local.json
+
+pyvenv.cfg
+
+ubyssey/settings*.py

article/migrations/0001_initial.py

@@ -17,7 +17,6 @@ class Migration(migrations.Migration):
  initial = True
 
  dependencies = [
- ('dispatch', '0108_auto_20210511_1359'),
  ('wagtailcore', '0062_comment_models_and_pagesubscription'),
  ('taggit', '0003_taggeditem_add_unique_index'),
  ]
@@ -73,13 +72,6 @@ class Migration(migrations.Migration):
  },
  bases=('wagtailcore.page',),
  ),
- migrations.CreateModel(
- name='DispatchCounterpartSnippet',
- fields=[
- ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('dispatch_version', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='dispatch.article')),
- ],
- ),
  migrations.CreateModel(
  name='ArticlePageTag',
  fields=[

article/migrations/0002_auto_20210709_0344.py

@@ -15,7 +15,6 @@ class Migration(migrations.Migration):
  ('section', '0001_initial'),
  ('images', '0001_initial'),
  ('taggit', '0003_taggeditem_add_unique_index'),
- ('dispatch', '0108_auto_20210511_1359'),
  ]
 
  operations = [
@@ -24,11 +23,6 @@ class Migration(migrations.Migration):
  name='category',
  field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='section.categorysnippet'),
  ),
- migrations.AddField(
- model_name='articlepage',
- name='dispatch_version',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='dispatch.article'),
- ),
  migrations.AddField(
  model_name='articlepage',
  name='tags',

article/models.py

@@ -7,8 +7,6 @@
 
 from dbtemplates.models import Template as DBTemplate
 
-from dispatch.models import Article
-
 from django.db import models
 from django.db.models import fields
 from django.db.models.fields import CharField
@@ -109,15 +107,6 @@ class Meta:
 
 #-----Snippet Models-----
 
-@register_snippet
-class DispatchCounterpartSnippet(models.Model):
- dispatch_version = models.ForeignKey(
- Article,
- null=True,
- blank=False,
- on_delete=models.SET_NULL,
- )
-
 @register_snippet
 class ArticleSeriesSnippet(ClusterableModel):
  title = fields.CharField(
@@ -578,14 +567,6 @@ class ArticlePage(RoutablePageMixin, SectionablePage, UbysseyMenuMixin):
  verbose_name="Is Explicit?",
  help_text = "Check if this article contains advertiser-unfriendly content. Disables ads for this specific article."
  )
- #-----Migration stuff------
- dispatch_version = models.ForeignKey(
- # Used to map the article to a previous version that exists in Dispatch
- "dispatch.Article",
- null=True,
- blank=True,
- on_delete=models.SET_NULL,
- )
 
 
  #-----Hidden stuff: editors don't get to modify these, but they may be programatically changed-----

article/templates/article/article_page_fw_story.html

@@ -1,6 +1,5 @@
 {% extends 'article/article_page.html' %}
 {% load static %}
-{% load dispatch_tags %}
 {% load wagtailimages_tags %}
 
 
@@ -89,7 +88,6 @@ <h1 class="headline">{{ self.title|safe }}</h1>
 {% block right-column %}
  <div class="right-column">
  <div class="sidebar">
- {% zone 'article-sidebar' %}
  {% if explicit is not True %}
  {% if self.minutes_to_read >= 3 %}
  {% include 'objects/advertisement.html' with size='skyscraper' name='Box_A' id=3 article=article.id %}

article/templates/article/objects/author_pinned.html

@@ -1,4 +1,4 @@
-{% load dispatch_filters %}
+{% load video_filters %}
 {% load wagtailcore_tags %}
 {% load wagtailimages_tags %}
 {% load humanize %}

article/templates/article/objects/bullet.html

@@ -1,4 +1,3 @@
-{% load dispatch_filters %}
 {% load wagtailcore_tags %}
 {% load wagtailimages_tags %}
 

article/templates/article/objects/cover_story.html

@@ -1,5 +1,5 @@
 {% load humanize %}
-{% load dispatch_filters %}
+{% load video_filters %}
 {% load wagtailcore_tags %}
 {% load wagtailimages_tags %}
 {% load articletags %}

article/templates/article/objects/default.html

@@ -1,6 +1,6 @@
-{% load dispatch_filters %}
 {% load wagtailcore_tags %}
 {% load wagtailimages_tags %}
+{% load video_filters %}
 
 <article class="o-article o-article--default{% if padded %} o-article--padded{% endif %}">
  {% if not hide_image and article.featured_media.first.image or article.featured_video %}

config/settings/base.py

@@ -17,10 +17,8 @@
 import sys
 import environ
 import google_crc32c
-from dispatch.apps import DispatchConfig
 
 BASE_DIR = environ.Path(__file__) - 3
-DISPATCH_APP_DIR = DispatchConfig.path
 
 env = environ.Env() # will reinitialize later once "earliest" configs have been set
 
@@ -132,22 +130,12 @@
  },
 }
 
-# TODO: Remove this line after Dispatch is removed as a dependency.
-# This silences a reverse accessor clash error between the
-# dispatch.User and users.User models.
-SILENCED_SYSTEM_CHECKS = [
- 'fields.E304' # Reverse accessor clash error
-]
-
 # Set secret keys
 SECRET_KEY = env('SECRET_KEY')
 NOTIFICATION_KEY = env('NOTIFICATION_KEY')
 
 # Application definition
 INSTALLED_APPS = [
- # NOTE: Until Dispatch is removed, this app must be loaded first so that
- # the dispatch.User model can be overridden by the `users` app below.
- 'dispatch.apps.DispatchConfig',
 
  # 'whitenoise.runserver_nostatic', # uncomment for testing "production-like" serving of collected static files with DEBUG=False
  'ubyssey', #For some reason using ubyssey.apps.UbysseyConfig breaks static file finding?
@@ -193,14 +181,14 @@
  'django.contrib.messages',
  'django.contrib.staticfiles',
  'django.contrib.humanize',
+ 'django.contrib.sites',
+
  'rest_framework',
  'rest_framework.authtoken',
- 'ubyssey.events',
  'django_user_agents',
  'django.contrib.admin',
  'django_extensions',
 
- 'django.contrib.sites',
  'dbtemplates',
  'wagtailmodelchooser',
  'wagtailmenus',
@@ -253,14 +241,7 @@
  'dbtemplates.loader.Loader',
  ],
  },
- },
- {
- 'NAME': 'dispatch',
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [
- DISPATCH_APP_DIR('templates')
- ],
- },
+ }
 ]
 
 TEMPLATES[0]['OPTIONS']['context_processors'].append("config.context_processors.get_light_mode")

config/settings/development.py

@@ -47,7 +47,6 @@
 GCS_CREDENTIALS_FILE = '../gcs-local.json'
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
-MEDIA_URL = '/media/'
 
 GCS_CREDENTIALS_FILE = '../gcs-local.json'
 

home/blocks.py

@@ -1,27 +1,16 @@
 """
 Blocks used on the home page of the site
 """
-from ads.models import HomeSidebarPlacementOrderable
 from article.models import ArticlePage
 from section.models import CategorySnippet
 
-from django import forms
 from django.db.models import Q
-from dispatch.models import Section
 
 from wagtail.core import blocks
 from wagtail.core.blocks import field_block
 
 from wagtail.snippets.blocks import SnippetChooserBlock
 from wagtail.images.blocks import ImageChooserBlock
-from wagtailmodelchooser.blocks import ModelChooserBlock
-
-class SectionChooserBlock(blocks.ChooserBlock):
- # based off code from:
- # https://groups.google.com/g/wagtail/c/S26h5GP9_Fk?pli=1
- # maybe move to a different namespace
- target_model = Section
- widget = forms.Select
 
 class HomepageFeaturedSectionBlock(blocks.StructBlock):
 

requirements-prd.txt

@@ -1,4 +1,3 @@
-dispatch==2.0.6
 Django==3.2.11
 wagtail==2.15.3
 git+https://github.com/ubyssey/[email protected]#egg=django-google-storage-updated

requirements.txt

@@ -1,4 +1,3 @@
-dispatch==2.0.6
 Django==3.2.11
 wagtail==2.15.3
 git+https://github.com/ubyssey/[email protected]#egg=django-google-storage-updated