Merge pull request #238 from uw-it-aca/task/django4.2

Task/django4.2

.github/workflows/cicd.yml

@@ -126,7 +126,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: |
-          python -m pip install --upgrade pip coverage coveralls==2.2.0
+          python -m pip install --upgrade pip coverage coveralls==3.3.1
           coverage combine
           coveralls
 

Dockerfile

@@ -1,6 +1,6 @@
 ARG DJANGO_CONTAINER_VERSION=1.4.1
 
-FROM gcr.io/uwit-mci-axdd/django-container:${DJANGO_CONTAINER_VERSION} as app-prebundler-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-prebundler-container
 
 USER root
 
@@ -17,7 +17,7 @@ RUN /app/bin/pip install psycopg2
 ADD --chown=acait:acait docker/app_start.sh /scripts
 RUN chmod u+x /scripts/app_start.sh
 
-FROM node:14.18.1-stretch AS node-bundler
+FROM node:lts-bullseye AS node-bundler
 
 ADD ./package.json /app/
 WORKDIR /app/
@@ -36,7 +36,7 @@ COPY --chown=acait:acait --from=node-bundler /app/pathways/static /app/pathways/
 
 RUN . /app/bin/activate && python manage.py collectstatic --noinput
 
-FROM gcr.io/uwit-mci-axdd/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
 
 ENV NODE_PATH=/app/lib/node_modules
 COPY --from=app-container /app/ /app/

docker/settings.py

@@ -13,6 +13,7 @@
         BASE_DIR, "pathways", "static", "manifest.json"
     )
 else:
+    CSRF_TRUSTED_ORIGINS = ['https://' + os.getenv('CLUSTER_CNAME')]
     VITE_MANIFEST_PATH = os.path.join(os.sep, "static", "manifest.json")
 
 # If you have file data, define the path here

docker/urls.py

@@ -1,5 +1,6 @@
 from .base_urls import *
-from django.urls import re_path, include
+from django.conf.urls import include
+from django.urls import re_path
 
 urlpatterns += [
     re_path(r'^', include('pathways.urls'))

package.json

@@ -24,7 +24,7 @@
     "@popperjs/core": "^2.11.6",
     "axdd-components": "git+https://github.com/uw-it-aca/axdd-components.git#1.0.5",
     "axios": "^0.27.2",
-    "bootstrap": "^5.2.3",
+    "bootstrap": "5.2.3",
     "bootstrap-icons": "^1.10.3",
     "d3": "^7.8.2",
     "jquery": "^3.6.3",

pathways/tests/__init__.py

@@ -4,17 +4,20 @@
 from django.test import RequestFactory, TestCase
 from django.contrib.auth.models import User
 from django.contrib.sessions.middleware import SessionMiddleware
+from pathways.data_import import (
+    import_major_data, import_course_data, import_curric_data)
+import mock
 import json
-from pathways.data_import import import_major_data, import_course_data, \
-    import_curric_data
 import csv
 
 
 class ApiTest(TestCase):
     def setUp(self):
         self.request = RequestFactory().get('/')
         self.request.user = User()
-        SessionMiddleware().process_request(self.request)
+        get_response = mock.MagicMock()
+        middleware = SessionMiddleware(get_response)
+        response = middleware(self.request)
         self.request.session.save()
         with open('pathways/tests/sample_coi_import.json') as coi_file:
             reader = csv.reader(coi_file)

pathways/tests/test_views.py

@@ -5,13 +5,16 @@
 from django.contrib.auth.models import User
 from django.contrib.sessions.middleware import SessionMiddleware
 from pathways.views.pages import DefaultPageView
+import mock
 
 
 class PagesViewTest(TestCase):
     def setUp(self):
         self.request = RequestFactory().get('/')
         self.request.user = User()
-        SessionMiddleware().process_request(self.request)
+        get_response = mock.MagicMock()
+        middleware = SessionMiddleware(get_response)
+        response = middleware(self.request)
         self.request.session.save()
 
     def test_context(self):

pathways/urls.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 from django.conf import settings
-from django.urls import include, path, re_path
+from django.urls import re_path
 from django.views.generic import TemplateView
 from pathways.views.pages import DefaultPageView
 from pathways.views.api.major import MajorDetails, MajorList

setup.py

@@ -24,8 +24,8 @@
     author_email="[email protected]",
     include_package_data=True,
     install_requires=[
-        "django~=3.2",
-        "UW-Django-SAML2~=1.5",
+        "django~=4.2",
+        "UW-Django-SAML2~=1.7",
     ],
     license="Apache License, Version 2.0",
     description="A tool for visually displaying UW course prerequisites",