Remove staticfiles for static. Update documentation.

FlipperPA · May 23, 2021 · 20a949d · 20a949d
1 parent f405e92
commit 20a949d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -29,41 +29,45 @@ INSTALLED_APPS = [
 ]
 
 PEREGRINE_APPS = [
-    'peregrine',
-    'bootstrap4',
-    'wagtailcodeblock',
-    'wagtailcontentstream',
-    'taggit',
-    'modelcluster',
-
-    'wagtail.core',
-    'wagtail.admin',
-    'wagtail.documents',
-    'wagtail.snippets',
-    'wagtail.users',
-    'wagtail.images',
-    'wagtail.embeds',
-    'wagtail.search',
-    'wagtail.sites',
-    'wagtail.contrib.settings',
-    'wagtail.contrib.modeladmin',
-    'wagtail.contrib.table_block',
+    "peregrine",
+    "bootstrap4",
+    "wagtailcodeblock",
+    "wagtailcontentstream",
+
+    "wagtail.contrib.forms",
+    "wagtail.contrib.redirects",
+    "wagtail.embeds",
+    "wagtail.sites",
+    "wagtail.users",
+    "wagtail.snippets",
+    "wagtail.documents",
+    "wagtail.images",
+    "wagtail.search",
+    "wagtail.admin",
+    "wagtail.core",
+    "taggit",
+    "modelcluster",
+
+    "wagtail.contrib.settings",
+    "wagtail.contrib.modeladmin",
+    "wagtail.contrib.table_block",
 ]
 
+
 INSTALLED_APPS += PEREGRINE_APPS
 
 MIDDLEWARE = [
     ...
 ]
 
 PEREGRINE_MIDDLEWARE = [
-    'wagtail.core.middleware.SiteMiddleware',
+    "wagtail.contrib.redirects.middleware.RedirectMiddleware",
 ]
 
 MIDDLEWARE += PEREGRINE_MIDDLEWARE
 
 # WAGTAIL_SITE_NAME is used by Wagtail; others are used by OpenGraph.
-WAGTAIL_SITE_NAME = "PyPhilly: Home of Tim Allen, aka FlipperPA"
+WAGTAIL_SITE_NAME = "PyPhilly: Home of FlipperPA"
 WAGTAIL_SITE_DESCRIPTION = "PyPhilly is the website of Tim Allen, a web developer living in Philadelphia. Tim has a wide range of interests, but mostly writes about Python, Django, and virtual reality."
 WAGTAIL_SITE_URL = "https://PyPhilly.org/"
 
@@ -126,5 +130,6 @@ You should then be able to navigate to http://localhost:8000/cms/ and log in, an
 ## Contributors
 
 * Jon Banafato (https://github.com/jonafato/)
+* Dave Bauer (https://github.com/tdxdave)
 * Rana Fayez (https://github.com/Tagine/)
 * Jeff Triplett (https://github.com/jefftriplett/)
diff --git a/peregrine/templates/peregrine/base.html b/peregrine/templates/peregrine/base.html
@@ -1,4 +1,4 @@
-{% load staticfiles bootstrap4 peregrine wagtailsettings_tags %}
+{% load static bootstrap4 peregrine wagtailsettings_tags %}
 <!DOCTYPE html>
 <!--[if lt IE 7]><html class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
 <!--[if IE 7]><html class="no-js lt-ie9 lt-ie8"><![endif]-->

diff --git a/setup.py b/setup.py
@@ -17,9 +17,9 @@
     setup_requires=["setuptools_scm"],
     use_scm_version=True,
     install_requires=[
-        "wagtail>=2.0",
+        "wagtail>=2.9",
         "wagtailcontentstream>=0.4.0",
-        "django-bootstrap4>=0.0.7",
+        "django-bootstrap4>=2",
     ],
     classifiers=[
         "Development Status :: 3 - Alpha",