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

Develop
uw-it-aca · Feb 13, 2024 · d133503 · d133503
2 parents 64464b5 + ec00dfa
commit d133503
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -24,6 +24,7 @@ name: tests
 
 env:
   APP_NAME: uw_myplan
+  COVERAGE_PYTHON_VERSION: '3.10'
 
 on:
   push:
@@ -37,7 +38,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout Repo
@@ -46,13 +47,13 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: '3.10'
 
       - 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
@@ -62,7 +63,7 @@ jobs:
       - name: Run Tests
         run: |
           python -m compileall ${APP_NAME}/
-          coverage run ${APP_NAME}/test.py -v
+          python -Wd -m coverage run ${APP_NAME}/test.py -v
 
       - name: Report Test Coverage
         env:
@@ -75,7 +76,7 @@ jobs:
 
     needs: test
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout Repo
@@ -84,7 +85,7 @@ jobs:
       - name: Setup Python
         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/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Build Status](https://github.com/uw-it-aca/uw-restclients-myplan/workflows/tests/badge.svg?branch=main)](https://github.com/uw-it-aca/uw-restclients-myplan/actions)
 [![Coverage Status](https://coveralls.io/repos/uw-it-aca/uw-restclients-myplan/badge.svg?branch=main)](https://coveralls.io/r/uw-it-aca/uw-restclients-myplan?branch=main)
 [![PyPi Version](https://img.shields.io/pypi/v/uw-restclients-myplan.svg)](https://pypi.python.org/pypi/uw-restclients-myplan)
-![Python versions](https://img.shields.io/pypi/pyversions/uw-restclients-myplan.svg)
+![Python versions](https://img.shields.io/badge/python-3.10-blue.svg)
 
 
 Installation:

diff --git a/setup.py b/setup.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 os
@@ -20,7 +20,7 @@
     name='UW-RestClients-MyPlan',
     version=VERSION,
     packages=['uw_myplan'],
-    author="UW-IT AXDD",
+    author="UW-IT T&LS",
     author_email="aca-it@uw.edu",
     include_package_data=True,
     install_requires=[
@@ -36,6 +36,5 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 3.8',
     ],
 )
diff --git a/uw_myplan/__init__.py b/uw_myplan/__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
 
 """

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

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

diff --git a/uw_myplan/test.py b/uw_myplan/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_myplan/tests/test_dao.py b/uw_myplan/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_myplan/tests/test_myplan.py b/uw_myplan/tests/test_myplan.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_myplan/utils.py b/uw_myplan/utils.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 commonconf import override_settings