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

Minimize pytz usage (#212)
uw-it-aca · Feb 5, 2024 · 30e7ce0 · 30e7ce0
2 parents 651e080 + 53088e6
commit 30e7ce0
Show file tree

Hide file tree

Showing 46 changed files with 76 additions and 71 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -24,6 +24,7 @@ name: tests
 
 env:
   APP_NAME: uw_sws
+  COVERAGE_PYTHON_VERSION: '3.10'
 
 on:
   push:
@@ -37,22 +38,29 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        python-version:
+          - '3.8'
+          - '3.9'
+          - '3.10'
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Python
-        uses: actions/setup-python@v3
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -e .
-          pip install commonconf nose2 coverage coveralls==2.2.0
+          pip install commonconf nose2 coverage coveralls==3.3.1
 
       - name: Run Python Linters
         uses: uw-it-aca/actions/python-linters@main
@@ -65,6 +73,7 @@ jobs:
           coverage run ${APP_NAME}/test.py -v
 
       - name: Report Test Coverage
+        if: matrix.python-version == env.COVERAGE_PYTHON_VERSION
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
@@ -75,16 +84,16 @@ jobs:
 
     needs: test
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: Publish to PyPi
         uses: uw-it-aca/actions/publish-pypi@main

diff --git a/setup.py b/setup.py
@@ -1,3 +1,6 @@
+# Copyright 2024 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import os
 from setuptools import setup
 
@@ -17,13 +20,13 @@
     name='UW-RestClients-SWS',
     version=VERSION,
     packages=['uw_sws'],
-    author="UW-IT AXDD",
+    author="UW-IT T&LS",
     author_email="aca-it@uw.edu",
     include_package_data=True,
     install_requires=['UW-RestClients-Core',
                       'UW-RestClients-PWS',
-                      'mock',
                       'pytz',
+                      'mock',
                      ],
     license='Apache License, Version 2.0',
     description=('A library for connecting to the SWS at the University '
@@ -35,7 +38,6 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
     ],
 )
 

diff --git a/uw_sws/__init__.py b/uw_sws/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/dao.py b/uw_sws/dao.py
@@ -1,29 +1,26 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
 Contains SWS DAO implementations.
 """
 import json
-import time
+import os
 import re
-import random
-from datetime import datetime, timedelta
-from pytz import timezone
-from commonconf import settings
+import pytz
+from datetime import datetime, timedelta, timezone
 from os.path import abspath, dirname
-import os
 from restclients_core.dao import DAO, MockDAO
 
-SWS_TIMEZONE = timezone("US/Pacific")
+SWS_TIMEZONE = pytz.timezone('America/Los_Angeles')
 
 
 def sws_now():
     """
     Return a naive datetime corresponding to the natural SWS timezone.
     """
     return datetime.fromtimestamp(
-        int(datetime.utcnow().strftime('%s')) +
+        int(datetime.now(timezone.utc).strftime('%s')) +
         int(datetime.now(SWS_TIMEZONE).utcoffset().total_seconds()))
 
 

diff --git a/uw_sws/degree.py b/uw_sws/degree.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import json

diff --git a/uw_sws/notice.py b/uw_sws/notice.py
@@ -1,14 +1,14 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """
 Interfaceing with the Student Web Service,
  for notice resource
 """
-import copy
+
+from datetime import timezone
 from dateutil import parser
 import logging
-import pytz
 from uw_sws.models import Notice, NoticeAttribute
 from uw_sws import get_resource, SWS_TIMEZONE
 
@@ -22,13 +22,12 @@ def get_notices_by_regid(regid):
     for the passed regid.
     """
     url = notice_res_url_prefix + regid + ".json"
-
     return _notices_from_json(get_resource(url))
 
 
 def _str_to_utc(date_str):
     date = parser.parse(date_str)
-    return SWS_TIMEZONE.localize(date).astimezone(pytz.utc)
+    return SWS_TIMEZONE.localize(date).astimezone(timezone.utc)
 
 
 def _notices_from_json(notice_data):

diff --git a/uw_sws/person.py b/uw_sws/person.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/section.py b/uw_sws/section.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 """

diff --git a/uw_sws/term_util.py b/uw_sws/term_util.py
diff --git a/uw_sws/test.py b/uw_sws/test.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 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,9 +1,8 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase
-from datetime import date, datetime
-import pytz
+from datetime import datetime, timezone
 from uw_sws.util import fdao_sws_override
 from uw_pws.util import fdao_pws_override
 from uw_sws.notice import get_notices_by_regid
@@ -14,9 +13,8 @@
 
 def date_to_dtime(adate):
     return SWS_TIMEZONE.localize(
-        datetime(
-            year=adate.year, month=adate.month, day=adate.day)
-        ).astimezone(pytz.utc).isoformat()
+        datetime(year=adate.year, month=adate.month, day=adate.day)
+    ).astimezone(timezone.utc).isoformat()
 
 
 @fdao_pws_override

diff --git a/uw_sws/tests/test_person.py b/uw_sws/tests/test_person.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 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 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from unittest import TestCase