From 5a82db937fac43563fa1b4946b0a6f47a21f5e0f Mon Sep 17 00:00:00 2001 From: Fang Lin Date: Tue, 3 Jan 2023 09:19:24 -0800 Subject: [PATCH 1/2] update license year --- setup.py | 7 +++++-- uw_pws/__init__.py | 2 +- uw_pws/dao.py | 2 +- uw_pws/exceptions.py | 2 +- uw_pws/models.py | 2 +- uw_pws/test.py | 2 +- uw_pws/tests/test_card.py | 2 +- uw_pws/tests/test_entity.py | 2 +- uw_pws/tests/test_models.py | 2 +- uw_pws/tests/test_person.py | 2 +- uw_pws/tests/test_photo.py | 2 +- uw_pws/util.py | 2 +- 12 files changed, 16 insertions(+), 13 deletions(-) diff --git a/setup.py b/setup.py index b0b6221..a708a2e 100644 --- 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 @@ -22,8 +25,8 @@ author_email="aca-it@uw.edu", include_package_data=True, install_requires=[ - 'UW-RestClients-Core<2.0', - 'nameparser>=1.0.4,<2.0', + 'UW-RestClients-Core', + 'nameparser', ], license='Apache License, Version 2.0', description=('A library for connecting to the Person Web Service at the ' diff --git a/uw_pws/__init__.py b/uw_pws/__init__.py index 9a62cba..343b1f0 100644 --- a/uw_pws/__init__.py +++ b/uw_pws/__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 """ diff --git a/uw_pws/dao.py b/uw_pws/dao.py index be52763..1dd3655 100644 --- a/uw_pws/dao.py +++ b/uw_pws/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_pws/exceptions.py b/uw_pws/exceptions.py index 0930cec..6431286 100644 --- a/uw_pws/exceptions.py +++ b/uw_pws/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 diff --git a/uw_pws/models.py b/uw_pws/models.py index f591d11..05f415b 100644 --- a/uw_pws/models.py +++ b/uw_pws/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 from nameparser import HumanName diff --git a/uw_pws/test.py b/uw_pws/test.py index 59f2c31..ec52c91 100644 --- a/uw_pws/test.py +++ b/uw_pws/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_pws/tests/test_card.py b/uw_pws/tests/test_card.py index 9b5b44b..2fde506 100644 --- a/uw_pws/tests/test_card.py +++ b/uw_pws/tests/test_card.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_pws/tests/test_entity.py b/uw_pws/tests/test_entity.py index 5244045..7c79fae 100644 --- a/uw_pws/tests/test_entity.py +++ b/uw_pws/tests/test_entity.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_pws/tests/test_models.py b/uw_pws/tests/test_models.py index ee83198..1eaa90f 100644 --- a/uw_pws/tests/test_models.py +++ b/uw_pws/tests/test_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 logging diff --git a/uw_pws/tests/test_person.py b/uw_pws/tests/test_person.py index 887d585..48dd60a 100644 --- a/uw_pws/tests/test_person.py +++ b/uw_pws/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 import logging diff --git a/uw_pws/tests/test_photo.py b/uw_pws/tests/test_photo.py index 5c313c7..ebf408f 100644 --- a/uw_pws/tests/test_photo.py +++ b/uw_pws/tests/test_photo.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_pws/util.py b/uw_pws/util.py index 00445e9..003524f 100644 --- a/uw_pws/util.py +++ b/uw_pws/util.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 commonconf import override_settings From f355bccd932bc0b7c267a3fbc5f1bbcc5acc474b Mon Sep 17 00:00:00 2001 From: Fang Lin Date: Tue, 3 Jan 2023 13:48:23 -0800 Subject: [PATCH 2/2] udpate to python 3.8, ubuntu-20.04 --- .github/workflows/cicd.yml | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 02a7354..919365c 100644 --- 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: | @@ -75,7 +75,7 @@ jobs: needs: test - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Checkout Repo diff --git a/setup.py b/setup.py index a708a2e..7f696ef 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.8', ], )