Merge pull request #192 from uw-it-aca/develop

Develop
uw-it-aca · Jan 19, 2023 · 2d27dfa · 2d27dfa
2 parents 0964019 + 6c55903
commit 2d27dfa
Show file tree

Hide file tree

Showing 44 changed files with 88 additions and 71 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -37,16 +37,16 @@ on:
 
 jobs:
   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@v3
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install Dependencies
         run: |
@@ -75,16 +75,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@v3
         with:
-          python-version: '3.x'
+          python-version: 3.8
 
       - name: Publish to PyPi
         uses: uw-it-aca/actions/publish-pypi@main

diff --git a/uw_sws/__init__.py b/uw_sws/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import json

diff --git a/uw_sws/adviser.py b/uw_sws/adviser.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 # Interfacing with the search for a student's academic advisers

diff --git a/uw_sws/campus.py b/uw_sws/campus.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/college.py b/uw_sws/college.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/compat.py b/uw_sws/compat.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/course.py b/uw_sws/course.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/curriculum.py b/uw_sws/curriculum.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/dao.py b/uw_sws/dao.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/degree.py b/uw_sws/degree.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 # Interfacing with the search for a student's degree status

diff --git a/uw_sws/department.py b/uw_sws/department.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/enrollment.py b/uw_sws/enrollment.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/exceptions.py b/uw_sws/exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from restclients_core.exceptions import DataFailureException

diff --git a/uw_sws/financial.py b/uw_sws/financial.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import logging

diff --git a/uw_sws/models.py b/uw_sws/models.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import json
@@ -1371,6 +1371,20 @@ def has_unfinished_pce_course(self):
         except AttributeError:
             return False
 
+    def json_data(self):
+        data = {
+            'is_honors': self.is_honors,
+            'class_level': self.class_level,
+            'regid': self.regid,
+            'is_enroll_src_pce': self.is_enroll_src_pce,
+            'is_registered': self.is_registered,
+            'has_pending_major_change': self.has_pending_major_change
+        }
+        if self.registrations:
+            data['registrations'] = [registration.json_data()
+                                     for registration in self.registrations]
+        return data
+
 
 class Major(models.Model):
     degree_abbr = models.CharField(max_length=50)

diff --git a/uw_sws/notice.py b/uw_sws/notice.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
@@ -60,7 +60,7 @@ def _notices_from_json(notice_data):
                     attribute._string_value = notice_attrib.get("Value")
                 else:
                     logger.warn(
-                        "Unkown attribute type: {}\nWith Value:{}".format(
+                        "Unknown attribute type '{}', with value '{}'".format(
                             attribute.data_type,
                             notice_attrib.get("Value")))
                     continue

diff --git a/uw_sws/person.py b/uw_sws/person.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/registration.py b/uw_sws/registration.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
@@ -12,13 +12,11 @@
 from datetime import datetime
 from uw_sws.models import Registration, RegistrationBlock, ClassSchedule
 from restclients_core.exceptions import DataFailureException
-from restclients_core.thread import (
-    Thread, GenericPrefetchThread, generic_prefetch)
-from uw_sws import get_resource, put_resource, UWPWS
-from uw_sws.person import get_person_by_regid
+from restclients_core.thread import GenericPrefetchThread, generic_prefetch
+from uw_sws import get_resource, put_resource
 from uw_sws.exceptions import ThreadedDataError
 from uw_sws.compat import deprecation
-from uw_sws.thread import SWSThread
+from uw_sws.thread import SWSCourseThread, SWSPersonByRegIDThread
 from uw_sws.section import _json_to_section, get_prefetch_for_section_data
 
 
@@ -28,17 +26,6 @@
 logger = logging.getLogger(__name__)
 
 
-class SWSPersonByRegIDThread(Thread):
-    regid = None
-    person = None
-
-    def run(self):
-        if self.regid is None:
-            raise Exception("SWSPersonByRegIDThread must have a regid")
-
-        self.person = UWPWS.get_person_by_regid(self.regid)
-
-
 def get_active_registrations_by_section(section, transcriptable_course=""):
     """
     Returns a list of restclients.Registration objects, representing
@@ -238,7 +225,7 @@ def _json_to_stud_reg_schedule(json_data, term, regid,
 
     try:
         for registration in json_data["Registrations"]:
-            thread = SWSThread()
+            thread = SWSCourseThread()
             thread.reg_json = registration
             thread.url = registration["Section"]["Href"]
             thread.headers = {"Accept": "application/json"}

diff --git a/uw_sws/section.py b/uw_sws/section.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/section_status.py b/uw_sws/section_status.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from uw_sws.exceptions import InvalidSectionID

diff --git a/uw_sws/term.py b/uw_sws/term.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/test.py b/uw_sws/test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 # This is just a test runner for coverage

diff --git a/uw_sws/tests/compatible.py b/uw_sws/tests/compatible.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_adviser.py b/uw_sws/tests/test_adviser.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_campus.py b/uw_sws/tests/test_campus.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_college.py b/uw_sws/tests/test_college.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_course.py b/uw_sws/tests/test_course.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_curriculum.py b/uw_sws/tests/test_curriculum.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_dao.py b/uw_sws/tests/test_dao.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_degree.py b/uw_sws/tests/test_degree.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_department.py b/uw_sws/tests/test_department.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_enrollment.py b/uw_sws/tests/test_enrollment.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_financial.py b/uw_sws/tests/test_financial.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_independent_study.py b/uw_sws/tests/test_independent_study.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_instructor_no_regid.py b/uw_sws/tests/test_instructor_no_regid.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_notice.py b/uw_sws/tests/test_notice.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_person.py b/uw_sws/tests/test_person.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_registrations.py b/uw_sws/tests/test_registrations.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_schedule_data.py b/uw_sws/tests/test_schedule_data.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_section.py b/uw_sws/tests/test_section.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from datetime import datetime, timedelta

diff --git a/uw_sws/tests/test_section_status.py b/uw_sws/tests/test_section_status.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase

diff --git a/uw_sws/tests/test_term.py b/uw_sws/tests/test_term.py
@@ -1,4 +1,4 @@
-# Copyright 2022 UW-IT, University of Washington
+# Copyright 2023 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import json