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

Develop
uw-it-aca · Apr 16, 2021 · 657d585 · 657d585
2 parents ecf809c + 0e3b778
commit 657d585
Show file tree

Hide file tree

Showing 29 changed files with 85 additions and 54 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -52,7 +52,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -e .
-          pip install pycodestyle nose2 coverage coveralls==2.2.0
+          pip install nose2 coverage coveralls==2.2.0
 
       - name: Start Servers
         shell: bash
@@ -62,8 +62,10 @@ jobs:
           python test/live_ssl_server.py &
           python test/live_ssl_bad_server.py &
 
-      - name: Run Pycodestyle
-        run: pycodestyle ${APP_NAME}/
+      - name: Run Python Linters
+        uses: uw-it-aca/actions/python-linters@main
+        with:
+          app_name: ${APP_NAME}
 
       - name: Run Tests
         env:

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Base class and utils for UW REST Clients
 
-[![Build Status](https://github.com/uw-it-aca/uw-restclients-core/workflows/tests/badge.svg?branch=master)](https://github.com/uw-it-aca/uw-restclients-core/actions)
-[![Coverage Status](https://coveralls.io/repos/uw-it-aca/uw-restclients-core/badge.svg?branch=master)](https://coveralls.io/r/uw-it-aca/uw-restclients-core?branch=master)
+[![Build Status](https://github.com/uw-it-aca/uw-restclients-core/workflows/tests/badge.svg?branch=main)](https://github.com/uw-it-aca/uw-restclients-core/actions)
+[![Coverage Status](https://coveralls.io/repos/uw-it-aca/uw-restclients-core/badge.svg?branch=main)](https://coveralls.io/r/uw-it-aca/uw-restclients-core?branch=main)
 [![PyPi Version](https://img.shields.io/pypi/v/uw-restclients-core.svg)](https://pypi.python.org/pypi/uw-restclients-core)
 ![Python versions](https://img.shields.io/pypi/pyversions/uw-restclients-core.svg)
 

diff --git a/restclients_core/cache.py b/restclients_core/cache.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 class NoCache(object):
     """
     A cache implementation that never caches.

diff --git a/restclients_core/cache_manager.py b/restclients_core/cache_manager.py
diff --git a/restclients_core/dao.py b/restclients_core/dao.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import random
 import datetime
 from restclients_core.util.mock import load_resource_from_path

diff --git a/restclients_core/exceptions.py b/restclients_core/exceptions.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 class ImproperlyConfigured(Exception):
     """Required setting is missing"""
     pass

diff --git a/restclients_core/models/__init__.py b/restclients_core/models/__init__.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import re
 import weakref
 from restclients_core.models.fields import (BooleanField, CharField, DateField,

diff --git a/restclients_core/models/fields.py b/restclients_core/models/fields.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import datetime
 import time
 

diff --git a/restclients_core/test.py b/restclients_core/test.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 # This is just a test runner for coverage
 from commonconf.backends import use_configparser_backend
 from os.path import abspath, dirname

diff --git a/restclients_core/tests/dao_implementation/test_backend.py b/restclients_core/tests/dao_implementation/test_backend.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase, skipUnless
 from commonconf import override_settings
 from restclients_core.dao import DAO, MockDAO

diff --git a/restclients_core/tests/dao_implementation/test_live.py b/restclients_core/tests/dao_implementation/test_live.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase, skipUnless
 from commonconf import override_settings
 from restclients_core.dao import DAO

diff --git a/restclients_core/tests/dao_implementation/test_mock.py b/restclients_core/tests/dao_implementation/test_mock.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase, skipIf
 from restclients_core.dao import DAO
 from os.path import abspath, dirname

diff --git a/restclients_core/tests/models/test_base.py b/restclients_core/tests/models/test_base.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from restclients_core import models
 from datetime import datetime

diff --git a/restclients_core/tests/models/test_clean.py b/restclients_core/tests/models/test_clean.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from restclients_core import models
 from datetime import datetime

diff --git a/restclients_core/tests/models/test_http_responses.py b/restclients_core/tests/models/test_http_responses.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from restclients_core.models import CacheHTTP
 from unittest import TestCase
 

diff --git a/restclients_core/tests/models/test_model_string.py b/restclients_core/tests/models/test_model_string.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from restclients_core import models
 

diff --git a/restclients_core/tests/test_local_cache.py b/restclients_core/tests/test_local_cache.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from threading import currentThread
 from restclients_core.util.local_cache import (

diff --git a/restclients_core/tests/test_prometheus.py b/restclients_core/tests/test_prometheus.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from restclients_core.tests.dao_implementation.test_backend import TDAO
 from unittest import TestCase
 from prometheus_client import generate_latest, REGISTRY

diff --git a/restclients_core/tests/test_thread.py b/restclients_core/tests/test_thread.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from commonconf import settings, override_settings
 from restclients_core.thread import is_django_mysql

diff --git a/restclients_core/tests/test_timing_log.py b/restclients_core/tests/test_timing_log.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from restclients_core.tests.dao_implementation.test_backend import TDAO
 from unittest import TestCase, skipUnless
 from commonconf import override_settings

diff --git a/restclients_core/tests/util/test_decorators.py b/restclients_core/tests/util/test_decorators.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from commonconf import settings
 from restclients_core.dao import DAO

diff --git a/restclients_core/tests/util/test_mock.py b/restclients_core/tests/util/test_mock.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from restclients_core.util.mock import convert_to_platform_safe
 

diff --git a/restclients_core/tests/util/test_retry.py b/restclients_core/tests/util/test_retry.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from unittest import TestCase
 from restclients_core.exceptions import DataFailureException
 from restclients_core.util.retry import retry

diff --git a/restclients_core/thread.py b/restclients_core/thread.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import threading
 from commonconf import settings
 """

diff --git a/restclients_core/util/decorators.py b/restclients_core/util/decorators.py
@@ -1,3 +1,6 @@
+# Copyright 2021 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,3 +1,6 @@
+# Copyright 2021 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,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 import re
 import os
 from os.path import isfile, join, dirname

diff --git a/restclients_core/util/performance.py b/restclients_core/util/performance.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from threading import currentThread
 from restclients_core.models import MockHTTP
 import time

diff --git a/restclients_core/util/retry.py b/restclients_core/util/retry.py
@@ -1,3 +1,6 @@
+# Copyright 2021 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
 from restclients_core.exceptions import DataFailureException
 import math
 import time