From 6b218e546e50fceb1ade902bf18c0bcc95257833 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Sun, 1 Aug 2021 17:27:48 -0300
Subject: [PATCH 1/2] Upgrade to Django 2.2.

Update dependencies for django 2.2 compatibility
---
 .gitignore                                    |  4 +
 banners/__init__.py                           |  1 +
 banners/apps.py                               |  6 ++
 base-requirements.txt                         | 41 ++++-----
 blogs/__init__.py                             |  1 +
 blogs/apps.py                                 |  6 ++
 blogs/urls.py                                 |  5 +-
 boxes/__init__.py                             |  1 +
 boxes/apps.py                                 |  6 ++
 boxes/factories.py                            |  3 +-
 boxes/urls.py                                 |  5 +-
 cms/__init__.py                               |  1 +
 cms/apps.py                                   |  6 ++
 codesamples/__init__.py                       |  1 +
 codesamples/apps.py                           |  6 ++
 codesamples/factories.py                      |  3 +-
 community/__init__.py                         |  1 +
 community/apps.py                             |  6 ++
 community/models.py                           |  2 +-
 community/urls.py                             |  7 +-
 companies/__init__.py                         |  1 +
 companies/apps.py                             |  6 ++
 companies/factories.py                        |  3 +-
 companies/models.py                           |  2 +-
 dev-requirements.txt                          |  8 +-
 downloads/__init__.py                         |  1 +
 downloads/api.py                              |  6 +-
 downloads/apps.py                             |  6 ++
 downloads/factories.py                        |  7 +-
 downloads/urls.py                             | 14 +--
 env_sample                                    | 30 +++++++
 events/__init__.py                            |  1 +
 events/apps.py                                |  6 ++
 events/factories.py                           |  3 +-
 events/models.py                              |  2 +-
 events/tests/test_importer.py                 | 20 ++---
 events/urls.py                                | 26 +++---
 events/utils.py                               |  2 +-
 jobs/factories.py                             |  9 +-
 jobs/listeners.py                             |  2 +-
 jobs/urls.py                                  | 40 ++++-----
 manage.py                                     | 18 +++-
 membership/__init__.py                        |  1 +
 membership/apps.py                            |  6 ++
 membership/urls.py                            |  5 +-
 minutes/__init__.py                           |  1 +
 minutes/apps.py                               |  6 ++
 minutes/urls.py                               |  9 +-
 nominations/__init__.py                       |  1 +
 nominations/apps.py                           |  6 ++
 nominations/urls.py                           | 27 ++----
 pages/__init__.py                             |  1 +
 pages/api.py                                  |  2 +-
 pages/apps.py                                 |  6 ++
 pages/factories.py                            |  3 +-
 pages/urls.py                                 |  5 +-
 pages/views.py                                |  4 +-
 peps/__init__.py                              |  1 +
 peps/apps.py                                  |  6 ++
 pydotorg/context_processors.py                |  6 +-
 pydotorg/settings/base.py                     | 19 ++--
 pydotorg/settings/heroku.py                   | 44 +++++----
 pydotorg/settings/local.py                    | 15 +++-
 pydotorg/urls.py                              | 89 ++++++++++---------
 pydotorg/urls_api.py                          |  4 +-
 sponsors/__init__.py                          |  1 +
 sponsors/admin.py                             |  6 +-
 sponsors/apps.py                              |  6 ++
 sponsors/forms.py                             |  2 +-
 .../0045_add_added_by_user_sponsorbenefit.py  | 18 ++++
 sponsors/urls.py                              |  9 +-
 successstories/__init__.py                    |  1 +
 successstories/apps.py                        |  6 ++
 successstories/factories.py                   |  5 +-
 successstories/urls.py                        | 11 ++-
 templates/components/navigation-widget.html   |  4 +-
 .../sponsors/admin/approve_application.html   |  2 +-
 .../sponsors/admin/execute_contract.html      |  2 +-
 .../sponsors/admin/nullify_contract.html      |  2 +-
 .../sponsors/admin/reject_application.html    |  2 +-
 .../rollback_sponsorship_to_editing.html      |  2 +-
 templates/sponsors/admin/send_contract.html   |  2 +-
 .../sponsors/sponsorship_benefits_form.html   |  2 +-
 users/admin.py                                |  2 +-
 users/factories.py                            |  5 +-
 users/migrations/0014_auto_20210801_2332.py   | 23 +++++
 users/models.py                               |  4 +-
 users/urls.py                                 | 23 +++--
 work_groups/__init__.py                       |  1 +
 work_groups/apps.py                           |  6 ++
 90 files changed, 475 insertions(+), 264 deletions(-)
 create mode 100644 banners/apps.py
 create mode 100644 blogs/apps.py
 create mode 100644 boxes/apps.py
 create mode 100644 cms/apps.py
 create mode 100644 codesamples/apps.py
 create mode 100644 community/apps.py
 create mode 100644 companies/apps.py
 create mode 100644 downloads/apps.py
 create mode 100644 env_sample
 create mode 100644 events/apps.py
 create mode 100644 membership/apps.py
 create mode 100644 minutes/apps.py
 create mode 100644 nominations/apps.py
 create mode 100644 pages/apps.py
 create mode 100644 peps/apps.py
 create mode 100644 sponsors/apps.py
 create mode 100644 sponsors/migrations/0045_add_added_by_user_sponsorbenefit.py
 create mode 100644 successstories/apps.py
 create mode 100644 users/migrations/0014_auto_20210801_2332.py
 create mode 100644 work_groups/apps.py

diff --git a/.gitignore b/.gitignore
index b2836fa19..8f018dc4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,5 +17,9 @@ static/stylesheets/no-mq.css
 static/stylesheets/style.css
 __pycache__
 *.db
+*.py[co]
 .vscode
 .~lock.*
+.idea
+.coverage
+.env
diff --git a/banners/__init__.py b/banners/__init__.py
index e69de29bb..010b54570 100644
--- a/banners/__init__.py
+++ b/banners/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'banners.apps.BannersAppConfig'
diff --git a/banners/apps.py b/banners/apps.py
new file mode 100644
index 000000000..9e3aa2c34
--- /dev/null
+++ b/banners/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BannersAppConfig(AppConfig):
+
+    name = 'banners'
diff --git a/base-requirements.txt b/base-requirements.txt
index 9f92092c4..66b693491 100644
--- a/base-requirements.txt
+++ b/base-requirements.txt
@@ -1,48 +1,49 @@
 dj-database-url==0.5.0
-django-pipeline==1.6.14
-django-sitetree==1.10.0
-Django==2.0.13
+django-pipeline==2.0.6
+django-sitetree==1.17.0
+Django==2.2.24
 docutils==0.12
 Markdown==3.3.4
-cmarkgfm==0.4.2
+cmarkgfm==0.6.0
 Pillow==8.3.1
 psycopg2==2.8.6
-python3-openid==3.1.0
+python3-openid==3.2.0
+python-decouple==3.4
 # lxml used by BeautifulSoup.
 lxml==4.6.3
-cssselect==0.9.1
+cssselect==1.1.0
 feedparser==6.0.8
-beautifulsoup4==4.6.0
-icalendar==3.8.4
+beautifulsoup4==4.9.3
+icalendar==4.0.7
 chardet==4.0.0
 # TODO: We may drop 'django-imagekit' completely.
 django-imagekit==4.0.2
-git+https://github.com/django-haystack/django-haystack.git@802b0f6f4b3b99314453261876a32bac2bbec94f
+django-haystack==3.0
 elasticsearch>=5,<6
 # TODO: 0.14.0 only supports Django 1.8 and 1.11.
-django-tastypie==0.14.1
+django-tastypie==0.14.3
 
-pytz==2017.2
-python-dateutil==2.8.1
+pytz==2021.1
+python-dateutil==2.8.2
 
 requests[security]>=2.26.0
 
-django-honeypot==0.6.0
-django-markupfield==1.4.3
+django-honeypot==1.0.1
+django-markupfield==2.0.0
 django-markupfield-helpers==0.1.1
 
 django-allauth==0.41.0
 
-django-waffle==0.14
+django-waffle==2.2.1
 
-djangorestframework==3.8.2
-django-filter==1.1.0
+djangorestframework==3.12.2
+django-filter==2.4.0
 django-ordered-model==3.4.3
 django-widget-tweaks==1.4.8
-django-countries==6.1.3
+django-countries==7.2.1
 xhtml2pdf==0.2.5
-django-easy-pdf==0.1.1
+django-easy-pdf3==0.1.2
 num2words==0.5.10
-django-polymorphic==2.1.2
+django-polymorphic==3.0.0
 sorl-thumbnail==12.7.0
 docxtpl==0.12.0
diff --git a/blogs/__init__.py b/blogs/__init__.py
index e69de29bb..620291c46 100644
--- a/blogs/__init__.py
+++ b/blogs/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'blogs.apps.BlogsAppConfig'
diff --git a/blogs/apps.py b/blogs/apps.py
new file mode 100644
index 000000000..0c88608d1
--- /dev/null
+++ b/blogs/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BlogsAppConfig(AppConfig):
+
+    name = 'blogs'
diff --git a/blogs/urls.py b/blogs/urls.py
index 84fe9d9a7..d315ed486 100644
--- a/blogs/urls.py
+++ b/blogs/urls.py
@@ -1,7 +1,6 @@
-from django.conf.urls import url
-
 from . import views
+from django.urls import path
 
 urlpatterns = [
-    url(r'^$', views.BlogHome.as_view(), name='blog'),
+    path('', views.BlogHome.as_view(), name='blog'),
 ]
diff --git a/boxes/__init__.py b/boxes/__init__.py
index e69de29bb..401a83d2e 100644
--- a/boxes/__init__.py
+++ b/boxes/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'boxes.apps.BoxesAppConfig'
diff --git a/boxes/apps.py b/boxes/apps.py
new file mode 100644
index 000000000..6f7e158e2
--- /dev/null
+++ b/boxes/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BoxesAppConfig(AppConfig):
+
+    name = 'boxes'
diff --git a/boxes/factories.py b/boxes/factories.py
index dde6bf033..5d8c7f2ad 100644
--- a/boxes/factories.py
+++ b/boxes/factories.py
@@ -4,13 +4,14 @@
 import factory
 
 from django.conf import settings
+from factory.django import DjangoModelFactory
 
 from .models import Box
 
 from users.factories import UserFactory
 
 
-class BoxFactory(factory.DjangoModelFactory):
+class BoxFactory(DjangoModelFactory):
 
     class Meta:
         model = Box
diff --git a/boxes/urls.py b/boxes/urls.py
index 2d1e6553d..8ac457c08 100644
--- a/boxes/urls.py
+++ b/boxes/urls.py
@@ -1,7 +1,6 @@
-from django.conf.urls import url
-
 from .views import box
+from django.urls import path
 
 urlpatterns = [
-    url(r'(?P<label>[\w-]+)/$', box, name='box'),
+    path('<slug:label>/', box, name='box'),
 ]
diff --git a/cms/__init__.py b/cms/__init__.py
index e69de29bb..92d29195c 100644
--- a/cms/__init__.py
+++ b/cms/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'cms.apps.CmsAppConfig'
diff --git a/cms/apps.py b/cms/apps.py
new file mode 100644
index 000000000..f9df91865
--- /dev/null
+++ b/cms/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CmsAppConfig(AppConfig):
+
+    name = 'cms'
diff --git a/codesamples/__init__.py b/codesamples/__init__.py
index e69de29bb..f51a992fa 100644
--- a/codesamples/__init__.py
+++ b/codesamples/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'codesamples.apps.CodesamplesAppConfig'
diff --git a/codesamples/apps.py b/codesamples/apps.py
new file mode 100644
index 000000000..565ae1f8b
--- /dev/null
+++ b/codesamples/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CodesamplesAppConfig(AppConfig):
+
+    name = 'codesamples'
diff --git a/codesamples/factories.py b/codesamples/factories.py
index fa257c0a7..49a60730f 100644
--- a/codesamples/factories.py
+++ b/codesamples/factories.py
@@ -1,13 +1,14 @@
 import textwrap
 
 import factory
+from factory.django import DjangoModelFactory
 
 from .models import CodeSample
 
 from users.factories import UserFactory
 
 
-class CodeSampleFactory(factory.DjangoModelFactory):
+class CodeSampleFactory(DjangoModelFactory):
 
     class Meta:
         model = CodeSample
diff --git a/community/__init__.py b/community/__init__.py
index e69de29bb..bc11cfaf6 100644
--- a/community/__init__.py
+++ b/community/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'community.apps.CommunityAppConfig'
diff --git a/community/apps.py b/community/apps.py
new file mode 100644
index 000000000..7dee88ac0
--- /dev/null
+++ b/community/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CommunityAppConfig(AppConfig):
+
+    name = 'community'
diff --git a/community/models.py b/community/models.py
index d328f49b6..1e199b590 100644
--- a/community/models.py
+++ b/community/models.py
@@ -1,7 +1,7 @@
 from django.contrib.postgres.fields import JSONField
 from django.urls import reverse
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from markupfield.fields import MarkupField
 
diff --git a/community/urls.py b/community/urls.py
index 3bf3657a6..531dfe015 100644
--- a/community/urls.py
+++ b/community/urls.py
@@ -1,9 +1,8 @@
-from django.conf.urls import url
-
 from . import views
+from django.urls import path
 
 app_name = 'community'
 urlpatterns = [
-    url(r'^$', views.PostList.as_view(), name='post_list'),
-    url(r'^(?P<pk>\d+)/$', views.PostDetail.as_view(), name='post_detail'),
+    path('', views.PostList.as_view(), name='post_list'),
+    path('<int:pk>/', views.PostDetail.as_view(), name='post_detail'),
 ]
diff --git a/companies/__init__.py b/companies/__init__.py
index e69de29bb..1a15cc943 100644
--- a/companies/__init__.py
+++ b/companies/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'companies.apps.CompaniesAppConfig'
diff --git a/companies/apps.py b/companies/apps.py
new file mode 100644
index 000000000..d34262a3c
--- /dev/null
+++ b/companies/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CompaniesAppConfig(AppConfig):
+
+    name = 'companies'
diff --git a/companies/factories.py b/companies/factories.py
index 92d4f084b..04e7b4ebf 100644
--- a/companies/factories.py
+++ b/companies/factories.py
@@ -1,9 +1,10 @@
 import factory
+from factory.django import DjangoModelFactory
 
 from .models import Company
 
 
-class CompanyFactory(factory.DjangoModelFactory):
+class CompanyFactory(DjangoModelFactory):
 
     class Meta:
         model = Company
diff --git a/companies/models.py b/companies/models.py
index 6c2a0b2cd..0e97cc779 100644
--- a/companies/models.py
+++ b/companies/models.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from markupfield.fields import MarkupField
 
 from cms.models import NameSlugModel
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 0221138b5..182beea18 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -2,14 +2,14 @@
 
 # Required for running tests
 
-factory-boy==2.9.2
+factory-boy==3.1.0
 Faker==0.8.1
 tblib==1.7.0
-responses==0.10.5
+responses==0.13.3
 
 # Extra stuff required for local dev
 
-django-debug-toolbar==1.9.1
+django-debug-toolbar==3.2.1
 coverage
 ddt
-model-bakery==1.2.0
+model-bakery==1.3.2
diff --git a/downloads/__init__.py b/downloads/__init__.py
index e69de29bb..0f460f952 100644
--- a/downloads/__init__.py
+++ b/downloads/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'downloads.apps.DownloadsAppConfig'
diff --git a/downloads/api.py b/downloads/api.py
index d179a2dbc..9cfd87fcb 100644
--- a/downloads/api.py
+++ b/downloads/api.py
@@ -87,7 +87,7 @@ class OSViewSet(viewsets.ModelViewSet):
     serializer_class = OSSerializer
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsStaffOrReadOnly,)
-    filter_fields = ('name', 'slug')
+    filterset_fields = ('name', 'slug')
 
 
 class ReleaseViewSet(BaseAPIViewSet):
@@ -95,7 +95,7 @@ class ReleaseViewSet(BaseAPIViewSet):
     serializer_class = ReleaseSerializer
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsStaffOrReadOnly,)
-    filter_fields = (
+    filterset_fields = (
         'name',
         'slug',
         'is_published',
@@ -123,7 +123,7 @@ class ReleaseFileViewSet(viewsets.ModelViewSet):
     serializer_class = ReleaseFileSerializer
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsStaffOrReadOnly,)
-    filter_class = ReleaseFileFilter
+    filterset_class = ReleaseFileFilter
 
     @action(detail=False, methods=['delete'])
     def delete_by_release(self, request):
diff --git a/downloads/apps.py b/downloads/apps.py
new file mode 100644
index 000000000..18c2db44c
--- /dev/null
+++ b/downloads/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class DownloadsAppConfig(AppConfig):
+
+    name = 'downloads'
diff --git a/downloads/factories.py b/downloads/factories.py
index 9e2e801db..4ebcbdc22 100644
--- a/downloads/factories.py
+++ b/downloads/factories.py
@@ -2,13 +2,14 @@
 
 import factory
 import requests
+from factory.django import DjangoModelFactory
 
 from users.factories import UserFactory
 
 from .models import OS, Release, ReleaseFile
 
 
-class OSFactory(factory.DjangoModelFactory):
+class OSFactory(DjangoModelFactory):
 
     class Meta:
         model = OS
@@ -17,7 +18,7 @@ class Meta:
     creator = factory.SubFactory(UserFactory)
 
 
-class ReleaseFactory(factory.DjangoModelFactory):
+class ReleaseFactory(DjangoModelFactory):
 
     class Meta:
         model = Release
@@ -27,7 +28,7 @@ class Meta:
     is_published = True
 
 
-class ReleaseFileFactory(factory.DjangoModelFactory):
+class ReleaseFileFactory(DjangoModelFactory):
 
     class Meta:
         model = ReleaseFile
diff --git a/downloads/urls.py b/downloads/urls.py
index 6cd133a57..d64f0a1ad 100644
--- a/downloads/urls.py
+++ b/downloads/urls.py
@@ -1,12 +1,12 @@
-from django.conf.urls import url
 from . import views
+from django.urls import path, re_path
 
 app_name = 'downloads'
 urlpatterns = [
-    url(r'latest/python2/?$', views.DownloadLatestPython2.as_view(), name='download_latest_python2'),
-    url(r'latest/python3/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3'),
-    url(r'operating-systems/$', views.DownloadFullOSList.as_view(), name='download_full_os_list'),
-    url(r'release/(?P<release_slug>[-_\w]+)/$', views.DownloadReleaseDetail.as_view(), name='download_release_detail'),
-    url(r'(?P<slug>[-_\w]+)/$', views.DownloadOSList.as_view(), name='download_os_list'),
-    url(r'$', views.DownloadHome.as_view(), name='download'),
+    re_path(r'latest/python2/?$', views.DownloadLatestPython2.as_view(), name='download_latest_python2'),
+    re_path(r'latest/python3/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3'),
+    path('operating-systems/', views.DownloadFullOSList.as_view(), name='download_full_os_list'),
+    path('release/<slug:release_slug>/', views.DownloadReleaseDetail.as_view(), name='download_release_detail'),
+    path('<slug:slug>/', views.DownloadOSList.as_view(), name='download_os_list'),
+    path('', views.DownloadHome.as_view(), name='download'),
 ]
diff --git a/env_sample b/env_sample
new file mode 100644
index 000000000..72c1e0b9a
--- /dev/null
+++ b/env_sample
@@ -0,0 +1,30 @@
+# development
+DATABASE_URL=postgres:///pythondotorg
+SEARCHBOX_SSL_URL=http://127.0.0.1:9200/
+
+# development optional
+#PEP_REPO_PATH=None
+
+# production required
+SECRET_KEY=
+ALLOWED_HOSTS=127.0.0.1,
+EMAIL_HOST=
+EMAIL_HOST_USER=
+EMAIL_HOST_PASSWORD=
+EMAIL_PORT=
+DEFAULT_FROM_EMAIL=
+PEP_ARTIFACT_URL=
+FASTLY_API_KEY=
+SENTRY_DSN=
+SOURCE_VERSION=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_STORAGE_BUCKET_NAME=
+
+
+# production optional
+#SPONSORSHIP_NOTIFICATION_FROM_EMAIL=
+#SPONSORSHIP_NOTIFICATION_TO_EMAIL=
+#AWS_DEFAULT_ACL=
+#AWS_S3_REGION_NAME=
+#AWS_S3_ENDPOINT_URL=
\ No newline at end of file
diff --git a/events/__init__.py b/events/__init__.py
index e69de29bb..28291bff9 100644
--- a/events/__init__.py
+++ b/events/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'events.apps.EventsAppConfig'
diff --git a/events/apps.py b/events/apps.py
new file mode 100644
index 000000000..23eadd3fe
--- /dev/null
+++ b/events/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class EventsAppConfig(AppConfig):
+
+    name = 'events'
diff --git a/events/factories.py b/events/factories.py
index 7d9b10f11..deef85b38 100644
--- a/events/factories.py
+++ b/events/factories.py
@@ -1,9 +1,10 @@
 import factory
+from factory.django import DjangoModelFactory
 
 from .models import Calendar
 
 
-class CalendarFactory(factory.DjangoModelFactory):
+class CalendarFactory(DjangoModelFactory):
 
     class Meta:
         model = Calendar
diff --git a/events/models.py b/events/models.py
index 563df67e2..3334ca326 100644
--- a/events/models.py
+++ b/events/models.py
@@ -9,7 +9,7 @@
 from django.template.defaultfilters import date
 from django.utils import timezone
 from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from cms.models import ContentManageable, NameSlugModel
 
diff --git a/events/tests/test_importer.py b/events/tests/test_importer.py
index 0e36a2feb..15a573063 100644
--- a/events/tests/test_importer.py
+++ b/events/tests/test_importer.py
@@ -26,8 +26,7 @@ def test_injest(self):
 
     def test_modified_event(self):
         importer = ICSImporter(self.calendar)
-        ical = """\
-BEGIN:VCALENDAR
+        ical = """BEGIN:VCALENDAR
 PRODID:-//Google Inc//Google Calendar 70.9054//EN
 VERSION:2.0
 CALSCALE:GREGORIAN
@@ -45,7 +44,7 @@ def test_modified_event(self):
 DESCRIPTION:<a href="https://www.barcamptools.eu/pycamp201604">PythonCamp C
  ologne 2016</a>
 LAST-MODIFIED:20160401T210533Z
-LOCATION:GFU Cyrus AG\, Am Grauen Stein 27\, 51105 Köln\, Germany
+LOCATION:GFU Cyrus AG, Am Grauen Stein 27, 51105 Köln, Germany
 SEQUENCE:0
 STATUS:CONFIRMED
 SUMMARY:PythonCamp Cologne 2016
@@ -71,8 +70,7 @@ def test_modified_event(self):
             e.next_or_previous_time.dt_end
         )
 
-        ical = """\
-BEGIN:VCALENDAR
+        ical = """BEGIN:VCALENDAR
 PRODID:-//Google Inc//Google Calendar 70.9054//EN
 VERSION:2.0
 CALSCALE:GREGORIAN
@@ -89,7 +87,7 @@ def test_modified_event(self):
 CREATED:20151113T123318Z
 DESCRIPTION:Python Istanbul
 LAST-MODIFIED:20160401T222533Z
-LOCATION:GFU Cyrus AG\, Am Grauen Stein 27\, 51105 Istanbul\, Turkey
+LOCATION:GFU Cyrus AG, Am Grauen Stein 27, 51105 Istanbul, Turkey
 SEQUENCE:0
 STATUS:CONFIRMED
 SUMMARY:PythonCamp Cologne 2016
@@ -114,8 +112,7 @@ def test_modified_event(self):
         )
 
     def test_import_event_excludes_ending_day_when_all_day_is_true(self):
-        ical = """\
-BEGIN:VCALENDAR
+        ical = """BEGIN:VCALENDAR
 BEGIN:VEVENT
 DTSTART;VALUE=DATE:20150328
 DTEND;VALUE=DATE:20150330
@@ -123,7 +120,7 @@ def test_import_event_excludes_ending_day_when_all_day_is_true(self):
 UID:pythoncalendartest@python.org
 SUMMARY:PythonCamp 2015 - Python Bar Camp in Cologne
 DESCRIPTION:Python PythonCamp 2015 - Python Bar Camp in Cologne
-LOCATION:GFU Cyrus AG\, Am Grauen Stein 27\, 51105 Cologne\, Germany
+LOCATION:GFU Cyrus AG, Am Grauen Stein 27, 51105 Cologne, Germany
 END:VEVENT
 END:VCALENDAR
 """
@@ -143,8 +140,7 @@ def test_import_event_excludes_ending_day_when_all_day_is_true(self):
         )
 
     def test_import_event_does_not_exclude_ending_day_when_all_day_is_false(self):
-        ical = """\
-BEGIN:VCALENDAR
+        ical = """BEGIN:VCALENDAR
 BEGIN:VEVENT
 DTSTART:20130802T200000Z
 DTEND:20130802T203000Z
@@ -152,7 +148,7 @@ def test_import_event_does_not_exclude_ending_day_when_all_day_is_false(self):
 UID:pythoncalendartestsingleday@python.org
 SUMMARY:PythonCamp 2015 - Python Bar Camp in Cologne
 DESCRIPTION:Python PythonCamp 2015 - Python Bar Camp in Cologne
-LOCATION:GFU Cyrus AG\, Am Grauen Stein 27\, 51105 Cologne\, Germany
+LOCATION:GFU Cyrus AG, Am Grauen Stein 27, 51105 Cologne, Germany
 END:VEVENT
 END:VCALENDAR
 """
diff --git a/events/urls.py b/events/urls.py
index c6e826166..8bb2d0135 100644
--- a/events/urls.py
+++ b/events/urls.py
@@ -1,20 +1,20 @@
-from django.conf.urls import url
 from django.views.generic import TemplateView
 
 from . import views
+from django.urls import path, re_path
 
 app_name = 'events'
 urlpatterns = [
-    url(r'calendars/$', views.CalendarList.as_view(), name='calendar_list'),
-    url(r'^submit/$', views.EventSubmit.as_view(), name='event_submit'),
-    url(r'^submit/thanks/$', TemplateView.as_view(template_name='events/event_form_thanks.html'), name='event_thanks'),
-    url(r'(?P<calendar_slug>[-_\w]+)/categories/(?P<slug>[-_\w]+)/$', views.EventListByCategory.as_view(), name='eventlist_category'),
-    url(r'(?P<calendar_slug>[-_\w]+)/categories/$', views.EventCategoryList.as_view(), name='eventcategory_list'),
-    url(r'(?P<calendar_slug>[-_\w]+)/locations/(?P<pk>\d+)/$', views.EventListByLocation.as_view(), name='eventlist_location'),
-    url(r'(?P<calendar_slug>[-_\w]+)/locations/$', views.EventLocationList.as_view(), name='eventlocation_list'),
-    url(r'(?P<calendar_slug>[-_\w]+)/date/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', views.EventListByDate.as_view(), name='eventlist_date'),
-    url(r'(?P<calendar_slug>[-_\w]+)/(?P<pk>\d+)/$', views.EventDetail.as_view(), name='event_detail'),
-    url(r'(?P<calendar_slug>[-_\w]+)/past/$', views.PastEventList.as_view(), name='event_list_past'),
-    url(r'(?P<calendar_slug>[-_\w]+)/$', views.EventList.as_view(), name='event_list'),
-    url(r'$', views.EventHomepage.as_view(), name='events'),
+    path('calendars/', views.CalendarList.as_view(), name='calendar_list'),
+    path('submit/', views.EventSubmit.as_view(), name='event_submit'),
+    path('submit/thanks/', TemplateView.as_view(template_name='events/event_form_thanks.html'), name='event_thanks'),
+    path('<slug:calendar_slug>/categories/<slug:slug>/', views.EventListByCategory.as_view(), name='eventlist_category'),
+    path('<slug:calendar_slug>/categories/', views.EventCategoryList.as_view(), name='eventcategory_list'),
+    path('<slug:calendar_slug>/locations/<int:pk>/', views.EventListByLocation.as_view(), name='eventlist_location'),
+    path('<slug:calendar_slug>/locations/', views.EventLocationList.as_view(), name='eventlocation_list'),
+    re_path(r'(?P<calendar_slug>[-a-zA-Z0-9_]+)/date/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', views.EventListByDate.as_view(), name='eventlist_date'),
+    path('<slug:calendar_slug>/<int:pk>/', views.EventDetail.as_view(), name='event_detail'),
+    path('<slug:calendar_slug>/past/', views.PastEventList.as_view(), name='event_list_past'),
+    path('<slug:calendar_slug>/', views.EventList.as_view(), name='event_list'),
+    path('', views.EventHomepage.as_view(), name='events'),
 ]
diff --git a/events/utils.py b/events/utils.py
index 0b57f9e75..a3801d4a6 100644
--- a/events/utils.py
+++ b/events/utils.py
@@ -3,7 +3,7 @@
 
 import pytz
 
-from django.utils.timezone import make_aware, is_aware
+from django.utils.timezone import is_aware, make_aware
 
 
 def seconds_resolution(dt):
diff --git a/jobs/factories.py b/jobs/factories.py
index 66ccd0e4c..a8c38b423 100644
--- a/jobs/factories.py
+++ b/jobs/factories.py
@@ -3,6 +3,7 @@
 
 from django.contrib.auth.models import Group
 from django.utils import timezone
+from factory.django import DjangoModelFactory
 
 from faker.providers import BaseProvider
 
@@ -57,7 +58,7 @@ def job_title(self):
 factory.Faker.add_provider(JobProvider)
 
 
-class JobCategoryFactory(factory.DjangoModelFactory):
+class JobCategoryFactory(DjangoModelFactory):
 
     class Meta:
         model = JobCategory
@@ -66,7 +67,7 @@ class Meta:
     name = factory.Faker('job_category')
 
 
-class JobTypeFactory(factory.DjangoModelFactory):
+class JobTypeFactory(DjangoModelFactory):
 
     class Meta:
         model = JobType
@@ -75,7 +76,7 @@ class Meta:
     name = factory.Faker('job_type')
 
 
-class JobFactory(factory.DjangoModelFactory):
+class JobFactory(DjangoModelFactory):
 
     class Meta:
         model = Job
@@ -139,7 +140,7 @@ class ReviewJobFactory(JobFactory):
     status = Job.STATUS_REVIEW
 
 
-class JobsBoardAdminGroupFactory(factory.DjangoModelFactory):
+class JobsBoardAdminGroupFactory(DjangoModelFactory):
     class Meta:
         model = Group
         django_get_or_create = ('name',)
diff --git a/jobs/listeners.py b/jobs/listeners.py
index a72e237d1..2e88bc793 100644
--- a/jobs/listeners.py
+++ b/jobs/listeners.py
@@ -4,7 +4,7 @@
 from django.dispatch import receiver
 from django.contrib.sites.models import Site
 from django.template import loader
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from .models import Job
 from .signals import (
diff --git a/jobs/urls.py b/jobs/urls.py
index 19e6c8068..319ec98c3 100644
--- a/jobs/urls.py
+++ b/jobs/urls.py
@@ -1,28 +1,28 @@
-from django.conf.urls import url
 from django.views.generic import TemplateView
 
 from . import views
 from . import feeds
+from django.urls import path
 
 app_name = 'jobs'
 urlpatterns = [
-    url(r'^$', views.JobList.as_view(), name='job_list'),
-    url(r'^feed/rss/$', feeds.JobFeed(), name='job_rss'),
-    url(r'^create/$', views.JobCreate.as_view(), name='job_create'),
-    url(r'^create-review-comment/$', views.JobReviewCommentCreate.as_view(), name='job_review_comment_create'),
-    url(r'^mine/$', views.JobListMine.as_view(), name='job_list_mine'),
-    url(r'^review/$', views.JobReview.as_view(), name='job_review'),
-    url(r'^moderate/$', views.JobModerateList.as_view(), name='job_moderate'),
-    url(r'^thanks/$', TemplateView.as_view(template_name="jobs/job_thanks.html"), name='job_thanks'),
-    url(r'^location/telecommute/$', views.JobTelecommute.as_view(), name='job_telecommute'),
-    url(r'^location/(?P<slug>[-_\w]+)/$', views.JobListLocation.as_view(), name='job_list_location'),
-    url(r'^type/(?P<slug>[-_\w]+)/$', views.JobListType.as_view(), name='job_list_type'),
-    url(r'^category/(?P<slug>[-_\w]+)/$', views.JobListCategory.as_view(), name='job_list_category'),
-    url(r'^locations/$', views.JobLocations.as_view(), name='job_locations'),
-    url(r'^types/$', views.JobTypes.as_view(), name='job_types'),
-    url(r'^categories/$', views.JobCategories.as_view(), name='job_categories'),
-    url(r'^(?P<pk>\d+)/edit/$', views.JobEdit.as_view(), name='job_edit'),
-    url(r'^(?P<pk>\d+)/preview/$', views.JobPreview.as_view(), name='job_preview'),
-    url(r'^(?P<pk>\d+)/remove/$', views.JobRemove.as_view(), name='job_remove'),
-    url(r'^(?P<pk>\d+)/$', views.JobDetail.as_view(), name='job_detail'),
+    path('', views.JobList.as_view(), name='job_list'),
+    path('feed/rss/', feeds.JobFeed(), name='job_rss'),
+    path('create/', views.JobCreate.as_view(), name='job_create'),
+    path('create-review-comment/', views.JobReviewCommentCreate.as_view(), name='job_review_comment_create'),
+    path('mine/', views.JobListMine.as_view(), name='job_list_mine'),
+    path('review/', views.JobReview.as_view(), name='job_review'),
+    path('moderate/', views.JobModerateList.as_view(), name='job_moderate'),
+    path('thanks/', TemplateView.as_view(template_name="jobs/job_thanks.html"), name='job_thanks'),
+    path('location/telecommute/', views.JobTelecommute.as_view(), name='job_telecommute'),
+    path('location/<slug:slug>/', views.JobListLocation.as_view(), name='job_list_location'),
+    path('type/<slug:slug>/', views.JobListType.as_view(), name='job_list_type'),
+    path('category/<slug:slug>/', views.JobListCategory.as_view(), name='job_list_category'),
+    path('locations/', views.JobLocations.as_view(), name='job_locations'),
+    path('types/', views.JobTypes.as_view(), name='job_types'),
+    path('categories/', views.JobCategories.as_view(), name='job_categories'),
+    path('<int:pk>/edit/', views.JobEdit.as_view(), name='job_edit'),
+    path('<int:pk>/preview/', views.JobPreview.as_view(), name='job_preview'),
+    path('<int:pk>/remove/', views.JobRemove.as_view(), name='job_remove'),
+    path('<int:pk>/', views.JobDetail.as_view(), name='job_detail'),
 ]
diff --git a/manage.py b/manage.py
index 57c2cf657..22c8d4c7b 100755
--- a/manage.py
+++ b/manage.py
@@ -1,8 +1,22 @@
 #!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
 import os
 import sys
 
-if __name__ == "__main__":
+
+def main():
+    """Run administrative tasks."""
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pydotorg.settings.local")
-    from django.core.management import execute_from_command_line
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
     execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/membership/__init__.py b/membership/__init__.py
index e69de29bb..2e00144a5 100644
--- a/membership/__init__.py
+++ b/membership/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'membership.apps.MembershipAppConfig'
diff --git a/membership/apps.py b/membership/apps.py
new file mode 100644
index 000000000..9f3dac7af
--- /dev/null
+++ b/membership/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MembershipAppConfig(AppConfig):
+
+    name = 'membership'
diff --git a/membership/urls.py b/membership/urls.py
index d4a5a4489..8d12b46c9 100644
--- a/membership/urls.py
+++ b/membership/urls.py
@@ -1,8 +1,7 @@
-from django.conf.urls import url
-
 from . import views
+from django.urls import path
 
 
 urlpatterns = [
-    url(r'^$', views.Membership.as_view(), name='membership'),
+    path('', views.Membership.as_view(), name='membership'),
 ]
diff --git a/minutes/__init__.py b/minutes/__init__.py
index e69de29bb..862de63c6 100644
--- a/minutes/__init__.py
+++ b/minutes/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'minutes.apps.MinutesAppConfig'
diff --git a/minutes/apps.py b/minutes/apps.py
new file mode 100644
index 000000000..dfdc40499
--- /dev/null
+++ b/minutes/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class MinutesAppConfig(AppConfig):
+
+    name = 'minutes'
diff --git a/minutes/urls.py b/minutes/urls.py
index 2c184b5b7..a957df34b 100644
--- a/minutes/urls.py
+++ b/minutes/urls.py
@@ -1,11 +1,10 @@
-from django.conf.urls import url
-
 from .feeds import MinutesFeed
 from . import views
+from django.urls import path, re_path
 
 
 urlpatterns = [
-    url(r'^$', views.MinutesList.as_view(), name='minutes_list'),
-    url(r'^feed/$', MinutesFeed(), name='minutes_feed'),
-    url(r'^(?P<year>[0-9]{4})-(?P<month>[0-9]{2})-(?P<day>[0-9]{2})/$', views.MinutesDetail.as_view(), name='minutes_detail'),
+    path('', views.MinutesList.as_view(), name='minutes_list'),
+    path('feed/', MinutesFeed(), name='minutes_feed'),
+    re_path(r'^(?P<year>[0-9]{4})-(?P<month>[0-9]{2})-(?P<day>[0-9]{2})/$', views.MinutesDetail.as_view(), name='minutes_detail'),
 ]
diff --git a/nominations/__init__.py b/nominations/__init__.py
index e69de29bb..368a604a5 100644
--- a/nominations/__init__.py
+++ b/nominations/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'nominations.apps.NominationsAppConfig'
diff --git a/nominations/apps.py b/nominations/apps.py
new file mode 100644
index 000000000..1180cd682
--- /dev/null
+++ b/nominations/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class NominationsAppConfig(AppConfig):
+
+    name = 'nominations'
diff --git a/nominations/urls.py b/nominations/urls.py
index a22f6b554..7cfa23a52 100644
--- a/nominations/urls.py
+++ b/nominations/urls.py
@@ -1,34 +1,23 @@
-from django.conf.urls import url
-
 from . import views
+from django.urls import path
 
 app_name = "nominations"
 urlpatterns = [
-    url(r"^elections/$", views.ElectionsList.as_view(), name="elections_list"),
-    url(r"^election/(?P<election>[-\w]+)/$", views.ElectionDetail.as_view(), name="election_detail"),
-    url(
-        r"^elections/(?P<election>[-\w]+)/nominees/$",
-        views.NomineeList.as_view(),
+    path('elections/', views.ElectionsList.as_view(), name="elections_list"),
+    path('election/<slug:election>/', views.ElectionDetail.as_view(), name="election_detail"),
+    path('elections/<slug:election>/nominees/', views.NomineeList.as_view(),
         name="nominees_list",
     ),
-    url(
-        r"^elections/(?P<election>[-\w]+)/nominees/(?P<slug>[-\w]+)/$",
-        views.NomineeDetail.as_view(),
+    path('elections/<slug:election>/nominees/<slug:slug>/', views.NomineeDetail.as_view(),
         name="nominee_detail",
     ),
-    url(
-        r"^(?P<election>[-\w]+)/create/$",
-        views.NominationCreate.as_view(),
+    path('<slug:election>/create/', views.NominationCreate.as_view(),
         name="nomination_create",
     ),
-    url(
-        r"^(?P<election>[-\w]+)/(?P<pk>\d+)/$",
-        views.NominationView.as_view(),
+    path('<slug:election>/<int:pk>/', views.NominationView.as_view(),
         name="nomination_detail",
     ),
-    url(
-        r"^(?P<election>[-\w]+)/(?P<pk>\d+)/edit/$",
-        views.NominationEdit.as_view(),
+    path('<slug:election>/<int:pk>/edit/', views.NominationEdit.as_view(),
         name="nomination_edit",
     ),
 ]
diff --git a/pages/__init__.py b/pages/__init__.py
index e69de29bb..6f1e657eb 100644
--- a/pages/__init__.py
+++ b/pages/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'pages.apps.PagesAppConfig'
diff --git a/pages/api.py b/pages/api.py
index 222220856..073f60e68 100644
--- a/pages/api.py
+++ b/pages/api.py
@@ -47,4 +47,4 @@ class PageViewSet(BaseReadOnlyAPIViewSet):
     serializer_class = PageSerializer
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsStaffOrReadOnly,)
-    filter_class = PageFilterSet
+    filterset_class = PageFilterSet
diff --git a/pages/apps.py b/pages/apps.py
new file mode 100644
index 000000000..da243ee7e
--- /dev/null
+++ b/pages/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class PagesAppConfig(AppConfig):
+
+    name = 'pages'
diff --git a/pages/factories.py b/pages/factories.py
index 14d3552b9..c525f11f4 100644
--- a/pages/factories.py
+++ b/pages/factories.py
@@ -1,13 +1,14 @@
 import factory
 
 from django.template.defaultfilters import slugify
+from factory.django import DjangoModelFactory
 
 from users.factories import UserFactory
 
 from .models import Page
 
 
-class PageFactory(factory.DjangoModelFactory):
+class PageFactory(DjangoModelFactory):
 
     class Meta:
         model = Page
diff --git a/pages/urls.py b/pages/urls.py
index 9b13784a6..df60e2732 100644
--- a/pages/urls.py
+++ b/pages/urls.py
@@ -1,7 +1,6 @@
-from django.conf.urls import url
-
 from .views import PageView
+from django.urls import path
 
 urlpatterns = [
-    url(r'(?P<path>.+)/$', PageView.as_view(), name='page_detail'),
+    path('<path:path>/', PageView.as_view(), name='page_detail'),
 ]
diff --git a/pages/views.py b/pages/views.py
index 20b3a4952..f7fabe374 100644
--- a/pages/views.py
+++ b/pages/views.py
@@ -38,8 +38,8 @@ def get_queryset(self):
     def content_type(self):
         return self.object.content_type
 
-    def get_extra_context(self, *args, **kwargs):
-        context = self.super().get_extra_context(*args, **kwargs)
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
         context['in_pages_app'] = True
         return context
 
diff --git a/peps/__init__.py b/peps/__init__.py
index e69de29bb..c71df1925 100644
--- a/peps/__init__.py
+++ b/peps/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'peps.apps.PepsAppConfig'
diff --git a/peps/apps.py b/peps/apps.py
new file mode 100644
index 000000000..a59996f2a
--- /dev/null
+++ b/peps/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class PepsAppConfig(AppConfig):
+
+    name = 'peps'
diff --git a/pydotorg/context_processors.py b/pydotorg/context_processors.py
index e273ad209..fc3fb2f53 100644
--- a/pydotorg/context_processors.py
+++ b/pydotorg/context_processors.py
@@ -12,10 +12,10 @@ def url_name(request):
     except Resolver404:
         return {}
     else:
-        namespace, url_name  = match.namespace, match.url_name
+        namespace, url_name_ = match.namespace, match.url_name
         if namespace:
-            url_name = f"{namespace}:{url_name}"
-        return {'URL_NAMESPACE': namespace, 'URL_NAME': url_name}
+            url_name_ = f"{namespace}:{url_name_}"
+        return {'URL_NAMESPACE': namespace, 'URL_NAME': url_name_}
 
 
 def get_host_with_scheme(request):
diff --git a/pydotorg/settings/base.py b/pydotorg/settings/base.py
index 2ec603eb2..3a7408c7a 100644
--- a/pydotorg/settings/base.py
+++ b/pydotorg/settings/base.py
@@ -1,5 +1,6 @@
 import os
-import dj_database_url
+from dj_database_url import parse as dj_database_url_parser
+from decouple import config
 
 from django.contrib.messages import constants
 
@@ -23,7 +24,11 @@
 ### Databases
 
 DATABASES = {
-    'default': dj_database_url.config(default='postgres:///python.org')
+    'default': config(
+        'DATABASE_URL',
+        default='postgres:///python.org',
+        cast=dj_database_url_parser
+    )
 }
 
 ### Locale settings
@@ -110,6 +115,8 @@
     },
 ]
 
+FORM_RENDERER = 'django.forms.renderers.DjangoTemplates'
+
 ### URLs, WSGI, middleware, etc.
 
 ROOT_URLCONF = 'pydotorg.urls'
@@ -255,11 +262,11 @@
 EVENTS_TO_EMAIL = 'events@python.org'
 
 # Sponsors
-SPONSORSHIP_NOTIFICATION_FROM_EMAIL = os.environ.get(
-    "SPONSORSHIP_NOTIFICATION_FROM_EMAIL", "sponsors@python.org"
+SPONSORSHIP_NOTIFICATION_FROM_EMAIL = config(
+    "SPONSORSHIP_NOTIFICATION_FROM_EMAIL", default="sponsors@python.org"
 )
-SPONSORSHIP_NOTIFICATION_TO_EMAIL = os.environ.get(
-    "SPONSORSHIP_NOTIFICATION_TO_EMAIL", "psf-sponsors@python.org"
+SPONSORSHIP_NOTIFICATION_TO_EMAIL = config(
+    "SPONSORSHIP_NOTIFICATION_TO_EMAIL", default="psf-sponsors@python.org"
 )
 PYPI_SPONSORS_CSV = os.path.join(BASE, "data", "pypi-sponsors.csv")
 
diff --git a/pydotorg/settings/heroku.py b/pydotorg/settings/heroku.py
index b065ddd90..c0ea38382 100644
--- a/pydotorg/settings/heroku.py
+++ b/pydotorg/settings/heroku.py
@@ -2,24 +2,30 @@
 
 import dj_database_url
 import raven
+from decouple import Csv
 
 from .base import *
 
 DEBUG = TEMPLATE_DEBUG = False
 
-DATABASES['default'] = dj_database_url.config(conn_max_age=600)
+DATABASE_CONN_MAX_AGE = 600
+DATABASES['default']['CONN_MAX_AGE'] = DATABASE_CONN_MAX_AGE
+
+HAYSTACK_SEARCHBOX_SSL_URL = config(
+    'SEARCHBOX_SSL_URL'
+)
 
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine',
-        'URL': os.environ.get('SEARCHBOX_SSL_URL'),
+        'URL': HAYSTACK_SEARCHBOX_SSL_URL,
         'INDEX_NAME': 'haystack-prod',
     },
 }
 
-SECRET_KEY = os.environ.get('SECRET_KEY')
+SECRET_KEY = config('SECRET_KEY')
 
-ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS').split(',')
+ALLOWED_HOSTS = config('ALLOWED_HOSTS', cast=Csv())
 
 MIDDLEWARE = [
     'whitenoise.middleware.WhiteNoiseMiddleware',
@@ -29,18 +35,18 @@
 DEFAULT_FILE_STORAGE = 'custom_storages.MediaStorage'
 STATICFILES_STORAGE = 'custom_storages.PipelineManifestStorage'
 
-EMAIL_HOST = os.environ.get('EMAIL_HOST')
-EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
-EMAIL_PORT = int(os.environ.get('EMAIL_PORT'))
+EMAIL_HOST = config('EMAIL_HOST')
+EMAIL_HOST_USER = config('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = config('EMAIL_HOST_PASSWORD')
+EMAIL_PORT = int(config('EMAIL_PORT'))
 EMAIL_USE_TLS = True
-DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL')
+DEFAULT_FROM_EMAIL = config('DEFAULT_FROM_EMAIL')
 
 PEP_REPO_PATH = None
-PEP_ARTIFACT_URL = os.environ.get('PEP_ARTIFACT_URL')
+PEP_ARTIFACT_URL = config('PEP_ARTIFACT_URL')
 
 # Fastly API Key
-FASTLY_API_KEY = os.environ.get('FASTLY_API_KEY')
+FASTLY_API_KEY = config('FASTLY_API_KEY')
 
 SECURE_SSL_REDIRECT = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_FASTLY_SSL', '1')
@@ -52,20 +58,20 @@
 ]
 
 RAVEN_CONFIG = {
-    "dsn": os.environ.get('SENTRY_DSN'),
-    "release": os.environ.get('SOURCE_VERSION'),
+    "dsn": config('SENTRY_DSN'),
+    "release": config('SOURCE_VERSION'),
 }
 
-AWS_ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID')
-AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY')
-AWS_STORAGE_BUCKET_NAME = os.environ.get('AWS_STORAGE_BUCKET_NAME')
-AWS_DEFAULT_ACL = os.environ.get('AWS_DEFAULT_ACL', 'public-read')
+AWS_ACCESS_KEY_ID = config('AWS_ACCESS_KEY_ID')
+AWS_SECRET_ACCESS_KEY = config('AWS_SECRET_ACCESS_KEY')
+AWS_STORAGE_BUCKET_NAME = config('AWS_STORAGE_BUCKET_NAME')
+AWS_DEFAULT_ACL = config('AWS_DEFAULT_ACL', default='public-read')
 AWS_AUTO_CREATE_BUCKET = False
 AWS_S3_OBJECT_PARAMETERS = {
     'CacheControl': 'max-age=86400',
 }
 AWS_QUERYSTRING_AUTH = False
 AWS_S3_FILE_OVERWRITE = False
-AWS_S3_REGION_NAME = os.environ.get('AWS_S3_REGION_NAME', 'us-east-1')
+AWS_S3_REGION_NAME = config('AWS_S3_REGION_NAME', default='us-east-1')
 AWS_S3_USE_SSL = True
-AWS_S3_ENDPOINT_URL = os.environ.get('AWS_S3_ENDPOINT_URL', 'https://s3.amazonaws.com')
+AWS_S3_ENDPOINT_URL = config('AWS_S3_ENDPOINT_URL', default='https://s3.amazonaws.com')
diff --git a/pydotorg/settings/local.py b/pydotorg/settings/local.py
index a58ea317f..61c98583d 100644
--- a/pydotorg/settings/local.py
+++ b/pydotorg/settings/local.py
@@ -12,13 +12,22 @@
 PYTHON_ORG_CONTENT_SVN_PATH = ''
 
 DATABASES = {
-    'default': dj_database_url.config(default='postgres:///pythondotorg')
+    'default': config(
+        'DATABASE_URL',
+        default='postgres:///pythondotorg',
+        cast=dj_database_url_parser
+    )
 }
 
+HAYSTACK_SEARCHBOX_SSL_URL = config(
+    'SEARCHBOX_SSL_URL',
+    default='http://127.0.0.1:9200/'
+)
+
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine',
-        'URL': 'http://127.0.0.1:9200/',
+        'URL': HAYSTACK_SEARCHBOX_SSL_URL,
         'INDEX_NAME': 'haystack',
     },
 }
@@ -27,7 +36,7 @@
 
 # Set the local pep repository path to fetch PEPs from,
 # or none to fallback to the tarball specified by PEP_ARTIFACT_URL.
-PEP_REPO_PATH = os.environ.get('PEP_REPO_PATH', None)  # directory path or None
+PEP_REPO_PATH = config('PEP_REPO_PATH', default=None)  # directory path or None
 
 # Set the path to where to fetch PEP artifacts from.
 # The value can be a local path or a remote URL.
diff --git a/pydotorg/urls.py b/pydotorg/urls.py
index c3827bd9b..5fc6b3f12 100644
--- a/pydotorg/urls.py
+++ b/pydotorg/urls.py
@@ -1,7 +1,8 @@
-from django.conf.urls import include, url, handler404
+from django.conf.urls import handler404, include
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.conf.urls.static import static
+from django.urls import path, re_path
 from django.views.generic.base import TemplateView, RedirectView
 from django.conf import settings
 
@@ -14,68 +15,68 @@
 
 urlpatterns = [
     # homepage
-    url(r'^$', views.IndexView.as_view(), name='home'),
-    url(r'^authenticated$', views.AuthenticatedView.as_view(), name='authenticated'),
-    url(r'^humans.txt$', TemplateView.as_view(template_name='humans.txt', content_type='text/plain')),
-    url(r'^robots.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')),
-    url(r'^shell/$', TemplateView.as_view(template_name="python/shell.html"), name='shell'),
+    path('', views.IndexView.as_view(), name='home'),
+    path('authenticated', views.AuthenticatedView.as_view(), name='authenticated'),
+    re_path(r'^humans.txt$', TemplateView.as_view(template_name='humans.txt', content_type='text/plain')),
+    re_path(r'^robots.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')),
+    path('shell/', TemplateView.as_view(template_name="python/shell.html"), name='shell'),
 
     # python section landing pages
-    url(r'^about/$', TemplateView.as_view(template_name="python/about.html"), name='about'),
+    path('about/', TemplateView.as_view(template_name="python/about.html"), name='about'),
 
     # Redirect old download links to new downloads pages
-    url(r'^download/$', RedirectView.as_view(url='https://www.python.org/downloads/', permanent=True)),
-    url(r'^download/source/$', RedirectView.as_view(url='https://www.python.org/downloads/source/', permanent=True)),
-    url(r'^download/mac/$', RedirectView.as_view(url='https://www.python.org/downloads/macos/', permanent=True)),
-    url(r'^download/windows/$', RedirectView.as_view(url='https://www.python.org/downloads/windows/', permanent=True)),
+    path('download/', RedirectView.as_view(url='https://www.python.org/downloads/', permanent=True)),
+    path('download/source/', RedirectView.as_view(url='https://www.python.org/downloads/source/', permanent=True)),
+    path('download/mac/', RedirectView.as_view(url='https://www.python.org/downloads/macos/', permanent=True)),
+    path('download/windows/', RedirectView.as_view(url='https://www.python.org/downloads/windows/', permanent=True)),
 
     # duplicated downloads to getit to bypass China's firewall. See
     # https://github.com/python/pythondotorg/issues/427 for more info.
-    url(r'^getit/', include('downloads.urls', namespace='getit')),
-    url(r'^downloads/', include('downloads.urls', namespace='download')),
-    url(r'^doc/$', views.DocumentationIndexView.as_view(), name='documentation'),
-    url(r'^blog/$', RedirectView.as_view(url='/blogs/', permanent=True)),
-    url(r'^blogs/', include('blogs.urls')),
-    url(r'^inner/$', TemplateView.as_view(template_name="python/inner.html"), name='inner'),
+    path('getit/', include('downloads.urls', namespace='getit')),
+    path('downloads/', include('downloads.urls', namespace='download')),
+    path('doc/', views.DocumentationIndexView.as_view(), name='documentation'),
+    path('blog/', RedirectView.as_view(url='/blogs/', permanent=True)),
+    path('blogs/', include('blogs.urls')),
+    path('inner/', TemplateView.as_view(template_name="python/inner.html"), name='inner'),
 
     # other section landing pages
-    url(r'^psf-landing/$', TemplateView.as_view(template_name="psf/index.html"), name='psf-landing'),
-    url(r'^psf/sponsors/$', TemplateView.as_view(template_name="psf/sponsors-list.html"), name='psf-sponsors'),
-    url(r'^docs-landing/$', TemplateView.as_view(template_name="docs/index.html"), name='docs-landing'),
-    url(r'^pypl-landing/$', TemplateView.as_view(template_name="pypl/index.html"), name='pypl-landing'),
-    url(r'^shop-landing/$', TemplateView.as_view(template_name="shop/index.html"), name='shop-landing'),
+    path('psf-landing/', TemplateView.as_view(template_name="psf/index.html"), name='psf-landing'),
+    path('psf/sponsors/', TemplateView.as_view(template_name="psf/sponsors-list.html"), name='psf-sponsors'),
+    path('docs-landing/', TemplateView.as_view(template_name="docs/index.html"), name='docs-landing'),
+    path('pypl-landing/', TemplateView.as_view(template_name="pypl/index.html"), name='pypl-landing'),
+    path('shop-landing/', TemplateView.as_view(template_name="shop/index.html"), name='shop-landing'),
 
     # Override /accounts/signup/ to add Honeypot.
-    url(r'^accounts/signup/', HoneypotSignupView.as_view()),
+    path('accounts/signup/', HoneypotSignupView.as_view()),
     # Override /accounts/password/change/ to add Honeypot
     # and change success URL.
-    url(r'^accounts/password/change/$', CustomPasswordChangeView.as_view(),
+    path('accounts/password/change/', CustomPasswordChangeView.as_view(),
         name='account_change_password'),
-    url(r'^accounts/', include('allauth.urls')),
-    url(r'^box/', include('boxes.urls')),
-    url(r'^community/', include('community.urls', namespace='community')),
-    url(r'^community/microbit/$', TemplateView.as_view(template_name="community/microbit.html"), name='microbit'),
-    url(r'^events/', include('events.urls', namespace='events')),
-    url(r'^jobs/', include('jobs.urls', namespace='jobs')),
-    url(r'^sponsors/', include('sponsors.urls')),
-    url(r'^success-stories/', include('successstories.urls')),
-    url(r'^users/', include('users.urls', namespace='users')),
+    path('accounts/', include('allauth.urls')),
+    path('box/', include('boxes.urls')),
+    path('community/', include('community.urls', namespace='community')),
+    path('community/microbit/', TemplateView.as_view(template_name="community/microbit.html"), name='microbit'),
+    path('events/', include('events.urls', namespace='events')),
+    path('jobs/', include('jobs.urls', namespace='jobs')),
+    path('sponsors/', include('sponsors.urls')),
+    path('success-stories/', include('successstories.urls')),
+    path('users/', include('users.urls', namespace='users')),
 
-    url(r'^psf/records/board/minutes/', include('minutes.urls')),
-    url(r'^membership/', include('membership.urls')),
-    url(r'^search/', include('haystack.urls')),
-    url(r'^nominations/', include('nominations.urls')),
+    path('psf/records/board/minutes/', include('minutes.urls')),
+    path('membership/', include('membership.urls')),
+    path('search/', include('haystack.urls')),
+    path('nominations/', include('nominations.urls')),
     # admin
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/', admin.site.urls),
+    path('admin/doc/', include('django.contrib.admindocs.urls')),
+    path('admin/', admin.site.urls),
 
     # api
-    url(r'^api/', include(urls_api.v1_api.urls)),
-    url(r'^api/v2/', include(urls_api.router.urls)),
-    url(r'^api/v2/', include(urls_api)),
+    path('api/', include(urls_api.v1_api.urls)),
+    path('api/v2/', include(urls_api.router.urls)),
+    path('api/v2/', include(urls_api)),
 
     # storage migration
-    url(r'^m/(?P<url>.*)/$', views.MediaMigrationView.as_view(prefix='media'), name='media_migration_view'),
+    re_path(r'^m/(?P<url>.*)/$', views.MediaMigrationView.as_view(prefix='media'), name='media_migration_view'),
 ]
 
 urlpatterns += staticfiles_urlpatterns()
@@ -84,5 +85,5 @@
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
     import debug_toolbar
     urlpatterns = [
-        url(r'^__debug__/', include(debug_toolbar.urls)),
+        path('__debug__/', include(debug_toolbar.urls)),
     ] + urlpatterns
diff --git a/pydotorg/urls_api.py b/pydotorg/urls_api.py
index e6adc77ac..688a3dee5 100644
--- a/pydotorg/urls_api.py
+++ b/pydotorg/urls_api.py
@@ -16,9 +16,9 @@
 v1_api.register(ReleaseFileResource())
 
 router = routers.DefaultRouter()
-router.register(r'pages/page', PageViewSet, base_name='page')
+router.register(r'pages/page', PageViewSet, basename='page')
 router.register(r'downloads/os', OSViewSet)
-router.register(r'downloads/release', ReleaseViewSet, base_name='release')
+router.register(r'downloads/release', ReleaseViewSet, basename='release')
 router.register(r'downloads/release_file', ReleaseFileViewSet)
 
 urlpatterns = [
diff --git a/sponsors/__init__.py b/sponsors/__init__.py
index e69de29bb..016e79088 100644
--- a/sponsors/__init__.py
+++ b/sponsors/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'sponsors.apps.SponsorsAppConfig'
diff --git a/sponsors/admin.py b/sponsors/admin.py
index dba6d1a0e..79452caad 100644
--- a/sponsors/admin.py
+++ b/sponsors/admin.py
@@ -138,10 +138,8 @@ class SponsorBenefitInline(admin.TabularInline):
     fields = ["sponsorship_benefit", "benefit_internal_value"]
     extra = 0
 
-    def has_add_permission(self, request):
-        # this work around is necessary because the `obj` parameter was added to
-        # InlineModelAdmin.has_add_permission only in Django 2.1.x and we're using 2.0.x
-        has_add_permission = super().has_add_permission(request)
+    def has_add_permission(self, request, obj=None):
+        has_add_permission = super().has_add_permission(request, obj=obj)
         match = request.resolver_match
         if match.url_name == "sponsors_sponsorship_change":
             sponsorship = self.parent_model.objects.get(pk=match.kwargs["object_id"])
diff --git a/sponsors/apps.py b/sponsors/apps.py
new file mode 100644
index 000000000..0eca9c16e
--- /dev/null
+++ b/sponsors/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SponsorsAppConfig(AppConfig):
+
+    name = 'sponsors'
diff --git a/sponsors/forms.py b/sponsors/forms.py
index c054cd61e..7a3bdc043 100644
--- a/sponsors/forms.py
+++ b/sponsors/forms.py
@@ -6,7 +6,7 @@
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.text import slugify
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_countries.fields import CountryField
 
 from sponsors.models import (
diff --git a/sponsors/migrations/0045_add_added_by_user_sponsorbenefit.py b/sponsors/migrations/0045_add_added_by_user_sponsorbenefit.py
new file mode 100644
index 000000000..5dc04b9c0
--- /dev/null
+++ b/sponsors/migrations/0045_add_added_by_user_sponsorbenefit.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2021-08-19 13:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sponsors', '0044_auto_20210827_1344'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sponsorbenefit',
+            name='added_by_user',
+            field=models.BooleanField(blank=True, default=False, verbose_name='Added by user?'),
+        ),
+    ]
diff --git a/sponsors/urls.py b/sponsors/urls.py
index d26838b45..998c032a3 100644
--- a/sponsors/urls.py
+++ b/sponsors/urls.py
@@ -1,18 +1,13 @@
-from django.conf.urls import url
 from django.urls import path
 
 from . import views
 
 
 urlpatterns = [
-    url(
-        r"^application/new/$",
-        views.NewSponsorshipApplicationView.as_view(),
+    path('application/new/', views.NewSponsorshipApplicationView.as_view(),
         name="new_sponsorship_application",
     ),
-    url(
-        r"^application/$",
-        views.SelectSponsorshipApplicationBenefitsView.as_view(),
+    path('application/', views.SelectSponsorshipApplicationBenefitsView.as_view(),
         name="select_sponsorship_application_benefits",
     ),
     path(
diff --git a/successstories/__init__.py b/successstories/__init__.py
index e69de29bb..e2c2c1446 100644
--- a/successstories/__init__.py
+++ b/successstories/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'successstories.apps.SuccessstoriesAppConfig'
diff --git a/successstories/apps.py b/successstories/apps.py
new file mode 100644
index 000000000..9eeec6668
--- /dev/null
+++ b/successstories/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SuccessstoriesAppConfig(AppConfig):
+
+    name = 'successstories'
diff --git a/successstories/factories.py b/successstories/factories.py
index 7d8f3edf3..8d3d9d85e 100644
--- a/successstories/factories.py
+++ b/successstories/factories.py
@@ -1,4 +1,5 @@
 import factory
+from factory.django import DjangoModelFactory
 
 from faker.providers import BaseProvider
 
@@ -23,7 +24,7 @@ def story_category(self):
 factory.Faker.add_provider(StoryProvider)
 
 
-class StoryCategoryFactory(factory.DjangoModelFactory):
+class StoryCategoryFactory(DjangoModelFactory):
 
     class Meta:
         model = StoryCategory
@@ -32,7 +33,7 @@ class Meta:
     name = factory.Faker('story_category')
 
 
-class StoryFactory(factory.DjangoModelFactory):
+class StoryFactory(DjangoModelFactory):
 
     class Meta:
         model = Story
diff --git a/successstories/urls.py b/successstories/urls.py
index b56d8c181..eb9a5a454 100644
--- a/successstories/urls.py
+++ b/successstories/urls.py
@@ -1,11 +1,10 @@
-from django.conf.urls import url
-
 from . import views
+from django.urls import path
 
 
 urlpatterns = [
-    url(r'^$', views.StoryList.as_view(), name='success_story_list'),
-    url(r'^create/$', views.StoryCreate.as_view(), name='success_story_create'),
-    url(r'^(?P<slug>[-_\w]+)/$', views.StoryDetail.as_view(), name='success_story_detail'),
-    url(r'^category/(?P<slug>[-_\w]+)/$', views.StoryListCategory.as_view(), name='success_story_list_category'),
+    path('', views.StoryList.as_view(), name='success_story_list'),
+    path('create/', views.StoryCreate.as_view(), name='success_story_create'),
+    path('<slug:slug>/', views.StoryDetail.as_view(), name='success_story_detail'),
+    path('category/<slug:slug>/', views.StoryListCategory.as_view(), name='success_story_list_category'),
 ]
diff --git a/templates/components/navigation-widget.html b/templates/components/navigation-widget.html
index cb2be2dfb..4c9364ebc 100644
--- a/templates/components/navigation-widget.html
+++ b/templates/components/navigation-widget.html
@@ -14,6 +14,6 @@
 
 {% if URL_NAMESPACE %}
     {% sitetree_tree from URL_NAMESPACE template "sitetree/sidebar_menu_root.html" %}
-{% endif %}
-
+{% elif URL_NAME %}
     {% sitetree_tree from URL_NAME template "sitetree/sidebar_menu_root.html" %}
+{% endif %}
\ No newline at end of file
diff --git a/templates/sponsors/admin/approve_application.html b/templates/sponsors/admin/approve_application.html
index 3ee19e3fc..2cf2d640a 100644
--- a/templates/sponsors/admin/approve_application.html
+++ b/templates/sponsors/admin/approve_application.html
@@ -1,6 +1,6 @@
 
 {% extends 'admin/change_form.html' %}
-{% load i18n admin_static sponsors %}
+{% load i18n static sponsors %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 
diff --git a/templates/sponsors/admin/execute_contract.html b/templates/sponsors/admin/execute_contract.html
index 7c5734f05..f3b29f5e5 100644
--- a/templates/sponsors/admin/execute_contract.html
+++ b/templates/sponsors/admin/execute_contract.html
@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static sponsors %}
+{% load i18n static sponsors %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 
diff --git a/templates/sponsors/admin/nullify_contract.html b/templates/sponsors/admin/nullify_contract.html
index ac98510dc..6f5927269 100644
--- a/templates/sponsors/admin/nullify_contract.html
+++ b/templates/sponsors/admin/nullify_contract.html
@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static sponsors %}
+{% load i18n static sponsors %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 
diff --git a/templates/sponsors/admin/reject_application.html b/templates/sponsors/admin/reject_application.html
index 0125f8a4a..83f1200b2 100644
--- a/templates/sponsors/admin/reject_application.html
+++ b/templates/sponsors/admin/reject_application.html
@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static sponsors %}
+{% load i18n static sponsors %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 
diff --git a/templates/sponsors/admin/rollback_sponsorship_to_editing.html b/templates/sponsors/admin/rollback_sponsorship_to_editing.html
index 29d157495..481a77295 100644
--- a/templates/sponsors/admin/rollback_sponsorship_to_editing.html
+++ b/templates/sponsors/admin/rollback_sponsorship_to_editing.html
@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static sponsors %}
+{% load i18n static sponsors %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 
diff --git a/templates/sponsors/admin/send_contract.html b/templates/sponsors/admin/send_contract.html
index 32e0ac344..4490e1eea 100644
--- a/templates/sponsors/admin/send_contract.html
+++ b/templates/sponsors/admin/send_contract.html
@@ -1,5 +1,5 @@
 {% extends 'admin/base_site.html' %}
-{% load i18n admin_static sponsors %}
+{% load i18n static sponsors %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %}
 
diff --git a/templates/sponsors/sponsorship_benefits_form.html b/templates/sponsors/sponsorship_benefits_form.html
index f1e6448ae..7e9fb5324 100644
--- a/templates/sponsors/sponsorship_benefits_form.html
+++ b/templates/sponsors/sponsorship_benefits_form.html
@@ -1,5 +1,5 @@
 {% extends "psf/full-width.html" %}
-{% load pipeline boxes humanize staticfiles sponsors %}
+{% load pipeline boxes humanize static sponsors %}
 
 
 {% block head %}
diff --git a/users/admin.py b/users/admin.py
index e442084ed..d42be419b 100644
--- a/users/admin.py
+++ b/users/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from rest_framework.authtoken.admin import TokenAdmin
 
diff --git a/users/factories.py b/users/factories.py
index 25b630597..3ba8ddae7 100644
--- a/users/factories.py
+++ b/users/factories.py
@@ -1,9 +1,10 @@
 import factory
+from factory.django import DjangoModelFactory
 
 from .models import User, Membership
 
 
-class UserFactory(factory.DjangoModelFactory):
+class UserFactory(DjangoModelFactory):
 
     class Meta:
         model = User
@@ -32,7 +33,7 @@ def groups(self, create, extracted, **kwargs):
                 self.groups.add(group)
 
 
-class MembershipFactory(factory.DjangoModelFactory):
+class MembershipFactory(DjangoModelFactory):
 
     class Meta:
         model = Membership
diff --git a/users/migrations/0014_auto_20210801_2332.py b/users/migrations/0014_auto_20210801_2332.py
new file mode 100644
index 000000000..8f248482a
--- /dev/null
+++ b/users/migrations/0014_auto_20210801_2332.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.5 on 2021-08-01 23:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0013_auto_20180705_0348'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='membership',
+            name='psf_announcements',
+            field=models.BooleanField(blank=True, null=True, verbose_name='I would like to receive occasional PSF email announcements'),
+        ),
+        migrations.AlterField(
+            model_name='membership',
+            name='psf_code_of_conduct',
+            field=models.BooleanField(blank=True, null=True, verbose_name='I agree to the PSF Code of Conduct'),
+        )
+    ]
diff --git a/users/models.py b/users/models.py
index 725d3e8b0..0733e23f6 100644
--- a/users/models.py
+++ b/users/models.py
@@ -94,8 +94,8 @@ class Membership(models.Model):
     postal_code = models.CharField(max_length=20, blank=True)
 
     # PSF fields
-    psf_code_of_conduct = models.NullBooleanField('I agree to the PSF Code of Conduct', blank=True)
-    psf_announcements = models.NullBooleanField('I would like to receive occasional PSF email announcements', blank=True)
+    psf_code_of_conduct = models.BooleanField('I agree to the PSF Code of Conduct', blank=True, null=True)
+    psf_announcements = models.BooleanField('I would like to receive occasional PSF email announcements', blank=True, null=True)
 
     # Voting
     votes = models.BooleanField("I would like to be a PSF Voting Member", default=False)
diff --git a/users/urls.py b/users/urls.py
index 3da615c4c..1240ea7fd 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -1,18 +1,17 @@
-from django.conf.urls import url
-
 from . import views
+from django.urls import path, re_path
 
 
 app_name = 'users'
 urlpatterns = [
-    url(r'^edit/$', views.UserUpdate.as_view(), name='user_profile_edit'),
-    url(r'^membership/$', views.MembershipCreate.as_view(), name='user_membership_create'),
-    url(r'^membership/edit/$', views.MembershipUpdate.as_view(), name='user_membership_edit'),
-    url(r'^membership/delete/(?P<slug>[-_\w\@\.+]+)/$', views.MembershipDeleteView.as_view(), name='user_membership_delete'),
-    url(r'^membership/thanks/$', views.MembershipThanks.as_view(), name='user_membership_thanks'),
-    url(r'^membership/affirm/$', views.MembershipVoteAffirm.as_view(), name='membership_affirm_vote'),
-    url(r'^membership/affirm/done/$', views.MembershipVoteAffirmDone.as_view(), name='membership_affirm_vote_done'),
-    url(r'^nominations/$', views.UserNominationsView.as_view(), name='user_nominations_view'),
-    url(r'^(?P<slug>[-_\w\@\.+]+)/delete/$', views.UserDeleteView.as_view(), name='user_delete'),
-    url(r'^(?P<slug>[-_\w\@\.+]+)/$', views.UserDetail.as_view(), name='user_detail'),
+    path('edit/', views.UserUpdate.as_view(), name='user_profile_edit'),
+    path('membership/', views.MembershipCreate.as_view(), name='user_membership_create'),
+    path('membership/edit/', views.MembershipUpdate.as_view(), name='user_membership_edit'),
+    re_path(r'^membership/delete/(?P<slug>[-a-zA-Z0-9_\@\.+]+)/$', views.MembershipDeleteView.as_view(), name='user_membership_delete'),
+    path('membership/thanks/', views.MembershipThanks.as_view(), name='user_membership_thanks'),
+    path('membership/affirm/', views.MembershipVoteAffirm.as_view(), name='membership_affirm_vote'),
+    path('membership/affirm/done/', views.MembershipVoteAffirmDone.as_view(), name='membership_affirm_vote_done'),
+    path('nominations/', views.UserNominationsView.as_view(), name='user_nominations_view'),
+    re_path(r'^(?P<slug>[-a-zA-Z0-9_\@\.+]+)/delete/$', views.UserDeleteView.as_view(), name='user_delete'),
+    re_path(r'^(?P<slug>[-a-zA-Z0-9_\@\.+]+)/$', views.UserDetail.as_view(), name='user_detail'),
 ]
diff --git a/work_groups/__init__.py b/work_groups/__init__.py
index e69de29bb..ef2fbcce9 100644
--- a/work_groups/__init__.py
+++ b/work_groups/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'work_groups.apps.WorkGroupsAppConfig'
diff --git a/work_groups/apps.py b/work_groups/apps.py
new file mode 100644
index 000000000..e2174c5ec
--- /dev/null
+++ b/work_groups/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class WorkGroupsAppConfig(AppConfig):
+
+    name = 'work_groups'

From 817fc242852bdddc8ddb5324c5d63c378081f2ee Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Tue, 24 Aug 2021 16:43:01 -0300
Subject: [PATCH 2/2] Fix Github Action PostgreSQL config

---
 .github/workflows/ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab45e9392..8f1e6fdf9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,8 +6,14 @@ jobs:
     services:
       postgres:
         image: postgres:10.1
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: pythonorg
         ports:
-          - 5432:5432
+        - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
@@ -33,7 +39,7 @@ jobs:
         run: |
           python -Wd -m coverage run manage.py test -v2
         env:
-          DATABASE_URL: postgres://postgres:@127.0.0.1:5432/python.org
+          DATABASE_URL: postgres://postgres:postgres@localhost:5432/pythonorg
       - name: Coverage
         run: |
           coverage report -m --fail-under=75