Merge 9bb16a3 into 1a9dca9

.github/workflows/cicd.yml

@@ -28,7 +28,7 @@ name: tests
 env:
   APP_NAME: grade_conversion_calculator
   CONF_PATH: conf
-  COVERAGE_DJANGO_VERSION: 2.2
+  COVERAGE_DJANGO_VERSION: 3.2
 
 on:
   push:
@@ -42,25 +42,26 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     strategy:
       matrix:
         django-version:
           - '2.2'
           - '3.2'
+          - '4.1'
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '12'
 
@@ -109,16 +110,16 @@ jobs:
 
     needs: test
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: 3.8
 
       - name: Publish to PyPi
         uses: uw-it-aca/actions/publish-pypi@main

conf/urls.py

@@ -1,4 +1,5 @@
-from django.urls import include, re_path
+from django.conf.urls import include
+from django.urls import re_path
 from django.views.i18n import JavaScriptCatalog
 
 

grade_conversion_calculator/tests/test_views.py

@@ -1,4 +1,4 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.test import TestCase

grade_conversion_calculator/urls.py

@@ -1,10 +1,10 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.urls import re_path
-from grade_conversion_calculator.views import demo
+from grade_conversion_calculator.views import DemoView
 
 
 urlpatterns = [
-    re_path(r'^calculator-demo/?$', demo, name='calculator_demo'),
+    re_path(r'^calculator-demo', DemoView.as_view(), name='calculator_demo'),
 ]

grade_conversion_calculator/views.py

@@ -1,8 +1,9 @@
-# Copyright 2021 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
-from django.shortcuts import render
 
+from django.views.generic import TemplateView
 
-def demo(request):
-    return render(request, "demo.html", {})
+
+class DemoView(TemplateView):
+    template_name = 'demo.html'