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

Develop
uw-it-aca · Jan 3, 2023 · f70141a · f70141a
2 parents 9a99f52 + 5331d87
commit f70141a
Show file tree

Hide file tree

Showing 31 changed files with 44 additions and 32 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -37,7 +37,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout Repo
@@ -46,7 +46,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.8
 
       - name: Install Dependencies
         run: |
@@ -86,7 +86,7 @@ jobs:
 
     needs: test
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout Repo

diff --git a/restclients_core/cache.py b/restclients_core/cache.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
 
 

diff --git a/restclients_core/dao.py b/restclients_core/dao.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
 
 import random

diff --git a/restclients_core/exceptions.py b/restclients_core/exceptions.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
 
 

diff --git a/restclients_core/models/__init__.py b/restclients_core/models/__init__.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
 
 import re
@@ -83,7 +83,7 @@ def _get_value(self, field_id):
 
     def _delete(self, field_id):
         self._init()
-        del(self._field_values[field_id])
+        del (self._field_values[field_id])
 
     def _track_field(self, field):
         self._dynamic_fields.add(weakref.ref(field))

diff --git a/restclients_core/models/fields.py b/restclients_core/models/fields.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
 
 import datetime

diff --git a/restclients_core/test.py b/restclients_core/test.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
 
 # This is just a test runner for coverage

diff --git a/restclients_core/tests/dao_implementation/test_backend.py b/restclients_core/tests/dao_implementation/test_backend.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 unittest import TestCase, skipUnless

diff --git a/restclients_core/tests/dao_implementation/test_live.py b/restclients_core/tests/dao_implementation/test_live.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 unittest import TestCase, skipUnless

diff --git a/restclients_core/tests/dao_implementation/test_mock.py b/restclients_core/tests/dao_implementation/test_mock.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 unittest import TestCase, skipIf

diff --git a/restclients_core/tests/models/test_base.py b/restclients_core/tests/models/test_base.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 unittest import TestCase
@@ -76,7 +76,7 @@ class ModelTest(models.Model):
         self.assertEquals(model.times, now.time())
         self.assertEquals(model.urls, "http://example.com/path")
 
-        del(model.urls)
+        del (model.urls)
         self.assertIsNone(model.urls)
 
     def test_2_fields_2_instances(self):

diff --git a/restclients_core/tests/models/test_clean.py b/restclients_core/tests/models/test_clean.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 unittest import TestCase

diff --git a/restclients_core/tests/models/test_http_responses.py b/restclients_core/tests/models/test_http_responses.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 restclients_core.models import CacheHTTP

diff --git a/restclients_core/tests/models/test_model_string.py b/restclients_core/tests/models/test_model_string.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 unittest import TestCase

diff --git a/restclients_core/tests/test_local_cache.py b/restclients_core/tests/test_local_cache.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 unittest import TestCase

diff --git a/restclients_core/tests/test_prometheus.py b/restclients_core/tests/test_prometheus.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 restclients_core.tests.dao_implementation.test_backend import TDAO

diff --git a/restclients_core/tests/test_thread.py b/restclients_core/tests/test_thread.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 unittest import TestCase

diff --git a/restclients_core/tests/test_timing_log.py b/restclients_core/tests/test_timing_log.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 restclients_core.tests.dao_implementation.test_backend import TDAO

diff --git a/restclients_core/tests/util/test_decorators.py b/restclients_core/tests/util/test_decorators.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 unittest import TestCase

diff --git a/restclients_core/tests/util/test_mock.py b/restclients_core/tests/util/test_mock.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 unittest import TestCase

diff --git a/restclients_core/tests/util/test_retry.py b/restclients_core/tests/util/test_retry.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 unittest import TestCase

diff --git a/restclients_core/thread.py b/restclients_core/thread.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
 
 import threading

diff --git a/restclients_core/util/decorators.py b/restclients_core/util/decorators.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 commonconf import override_settings

diff --git a/restclients_core/util/local_cache.py b/restclients_core/util/local_cache.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 threading import currentThread

diff --git a/restclients_core/util/mock.py b/restclients_core/util/mock.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
 
 import re

diff --git a/restclients_core/util/performance.py b/restclients_core/util/performance.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 threading import currentThread

diff --git a/restclients_core/util/retry.py b/restclients_core/util/retry.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 restclients_core.exceptions import DataFailureException

diff --git a/setup.py b/setup.py
@@ -1,3 +1,6 @@
+# Copyright 2023 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import os
 from setuptools import setup
 
@@ -36,7 +39,7 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.8',
     ],
 )
 

diff --git a/test/live_server.py b/test/live_server.py
@@ -1,3 +1,6 @@
+# Copyright 2023 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 #!/usr/bin/python
 try:
     from http.server import BaseHTTPRequestHandler, HTTPServer

diff --git a/test/live_ssl_bad_server.py b/test/live_ssl_bad_server.py
@@ -1,3 +1,6 @@
+# Copyright 2023 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 try:
     from http.server import BaseHTTPRequestHandler, HTTPServer
 except ImportError:

diff --git a/test/live_ssl_server.py b/test/live_ssl_server.py
@@ -1,3 +1,6 @@
+# Copyright 2023 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 try:
     from http.server import BaseHTTPRequestHandler, HTTPServer
 except ImportError: