From bf387014fc512a70f31a359aa3bfe3dc6870574a Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Tue, 30 Apr 2024 13:25:52 -0400 Subject: [PATCH 1/4] Require tekrsa-api-wrap>=1.3.3 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c1c85d7..15a16cf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", - "tekrsa-api-wrap>=1.3.2", + "tekrsa-api-wrap>=1.3.3", "scos_actions @ git+https://github.com/NTIA/scos-actions@9.0.0", ] From aadbc3b25a1f64083b6d78a96c2717efaaee3d90 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Tue, 30 Apr 2024 13:28:31 -0400 Subject: [PATCH 2/4] Use markdown formatted LICENSE --- .pre-commit-config.yaml | 2 +- LICENSE.md | 37 ++++++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8e8445c..5be6425 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,4 +39,4 @@ repos: hooks: - id: markdownlint types: [file, markdown] - exclude: GitHubRepoPublicReleaseApproval.md|LICENSE.md + exclude: GitHubRepoPublicReleaseApproval.md diff --git a/LICENSE.md b/LICENSE.md index 3a6dc58..add8ca7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,15 +1,34 @@ -SOFTWARE DISCLAIMER / RELEASE +# SOFTWARE DISCLAIMER / RELEASE -The software made available on this site requires the Tektronix RSA API for Linux, which is made available by Tektronix and may contain one or more programs licensed under the GPL or LGPL. +This software was developed by employees of the National Telecommunications and Information +Administration (NTIA), an agency of the Federal Government and is provided to you +as a public service. Pursuant to Title 15 United States Code Section 105, works +of NTIA employees are not subject to copyright protection within the United States. -All software included on this site was developed by employees of the National Telecommunications and Information Administration (NTIA), an agency of the Federal Government and is provided to you as a public service. Pursuant to Title 15 United States Code Section 105, works of NTIA employees are not subject to copyright protection within the United States. +The software is provided by NTIA “AS IS.” NTIA MAKES NO WARRANTY OF ANY KIND, EXPRESS, +IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT AND DATA ACCURACY. NTIA does +not warrant or make any representations regarding the use of the software or the +results thereof, including but not limited to the correctness, accuracy, reliability +or usefulness of the software. -The software is provided by NTIA “AS IS.” NTIA MAKES NO WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT AND DATA ACCURACY. NTIA does not warrant or make any representations regarding the use of the software or the results thereof, including but not limited to the correctness, accuracy, reliability or usefulness of the software. +To the extent that NTIA holds rights in countries other than the United States, +you are hereby granted the non-exclusive irrevocable and unconditional right to +print, publish, prepare derivative works and distribute the NTIA software, in any +medium, or authorize others to do so on your behalf, on a royalty-free basis throughout +the World. -To the extent that NTIA holds rights in countries other than the United States, you are hereby granted the non-exclusive irrevocable and unconditional right to print, publish, prepare derivative works and distribute the NTIA software, in any medium, or authorize others to do so on your behalf, on a royalty-free basis throughout the World. +You may improve, modify, and create derivative works of the software or any portion +of the software, and you may copy and distribute such modifications or works. Modified +works should carry a notice stating that you changed the software and should note +the date and nature of any such change. -You may improve, modify, and create derivative works of the software or any portion of the software, and you may copy and distribute such modifications or works. Modified works should carry a notice stating that you changed the software and should note the date and nature of any such change. +You are solely responsible for determining the appropriateness of using and distributing +the software and you assume all risks associated with its use, including but not +limited to the risks and costs of program errors, compliance with applicable laws, +damage to or loss of data, programs or equipment, and the unavailability or interruption +of operation. This software is not intended to be used in any situation where a failure +could cause risk of injury or damage to property. -You are solely responsible for determining the appropriateness of using and distributing the software and you assume all risks associated with its use, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and the unavailability or interruption of operation. This software is not intended to be used in any situation where a failure could cause risk of injury or damage to property. - -Please provide appropriate acknowledgments of NTIA’s creation of the software in any copies or derivative works of this software. +Please provide appropriate acknowledgments of NTIA’s creation of the software in +any copies or derivative works of this software. From 0e6dc9ffcf31da940e7cc2a9d97494f4ebf19df9 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Tue, 30 Apr 2024 13:31:19 -0400 Subject: [PATCH 3/4] Update and run all pre-commit hooks --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5be6425..df29778 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.2 hooks: - id: pyupgrade args: ["--py38-plus"] @@ -30,12 +30,12 @@ repos: types: [file, python] args: ["--profile", "black", "--filter-files", "--gitignore"] - repo: https://github.com/psf/black - rev: 24.1.1 + rev: 24.4.2 hooks: - id: black types: [file, python] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.39.0 + rev: v0.40.0 hooks: - id: markdownlint types: [file, markdown] From ac02ce8534ad5a54d9a9f65f9099d2564bf36852 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello Date: Tue, 30 Apr 2024 13:32:04 -0400 Subject: [PATCH 4/4] Bump version to 6.0.1 Includes bug fixes by requiring tekrsa-api-wrap>=1.3.3 --- src/scos_tekrsa/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/__init__.py b/src/scos_tekrsa/__init__.py index 0f607a5..79a961b 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "6.0.0" +__version__ = "6.0.1"