From 95bce600961ea23ebf30356a1b3ce002972bf53d Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Fri, 16 Aug 2024 15:22:38 -0600 Subject: [PATCH 01/24] update ubuntu version, scos-actions version --- docker/Dockerfile | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3f6feb02..9130e256 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 # Create Tektronix.rules as described in RSA API installation notes RUN mkdir -p /etc/udev/rules.d/ diff --git a/pyproject.toml b/pyproject.toml index 02f6ced3..9f240856 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.2", + "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-234_ubuntu22.04_python3.10", ] [project.optional-dependencies] From cd88d5dce7cd1e14021bc459517bd0380692bc07 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 30 Sep 2024 08:23:33 -0600 Subject: [PATCH 02/24] change scos-actions branch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9f240856..c8bde58e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-234_ubuntu22.04_python3.10", + "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-234_ubuntu22.04_python3.10_ray2.10", ] [project.optional-dependencies] From 8d1ce7ce0ccd38888f0fbc263f4b7df3e00924d4 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 30 Sep 2024 09:55:47 -0600 Subject: [PATCH 03/24] update contact info --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 289e766d..169cc73d 100644 --- a/README.md +++ b/README.md @@ -217,7 +217,8 @@ TEKTRONIX and TEK are registered trademarks of Tektronix, Inc. ## Contact -For technical questions about `scos_tekrsa`, contact Anthony Romaniello, +For technical questions about `scos_tekrsa`, contact the +[ITS Spectrum Monitoring Team](mailto:spectrummonitoring@ntia.gov). ## Disclaimer From fbc397d6cd8d06fc700f56f93459d1ee03bd3cc9 Mon Sep 17 00:00:00 2001 From: "dboulware@ntia.doc.gov" Date: Tue, 15 Oct 2024 14:02:33 -0600 Subject: [PATCH 04/24] cal_NAN_prevention branch of scos-actions. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 02f6ced3..95f9578f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.2", + "scos_actions @ git+https://github.com/NTIA/scos-actions@cal_NAN_prevention", ] [project.optional-dependencies] From 7ba50399a5a667f343170ef79466621cb664f806 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:00:21 -0500 Subject: [PATCH 05/24] Update pre-commit hooks --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df297783..59ce8b06 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ default_language_version: python: python3.8 repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-ast types: [file, python] @@ -18,7 +18,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v3.15.2 + rev: v3.19.0 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.4.2 + rev: 24.10.0 hooks: - id: black types: [file, python] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.40.0 + rev: v0.42.0 hooks: - id: markdownlint types: [file, markdown] From 07748b79341f8fe5f16a39f288d7cc2de2b4f954 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:00:48 -0500 Subject: [PATCH 06/24] Add support and testing for Py 3.12 and 3.13 --- .github/workflows/tox.yaml | 2 ++ pyproject.toml | 2 ++ tox.ini | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml index 231ad3d6..daadec0a 100644 --- a/.github/workflows/tox.yaml +++ b/.github/workflows/tox.yaml @@ -37,6 +37,8 @@ jobs: - "3.9" - "3.10" - "3.11" + - "3.12" + - "3.13" steps: - name: Set up Python ${{ matrix.py }} uses: actions/setup-python@v4 diff --git a/pyproject.toml b/pyproject.toml index 95f9578f..e23c8814 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,6 +36,8 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] dependencies = [ diff --git a/tox.ini b/tox.ini index 744e82ac..8398ec1a 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,8 @@ env_list = py39 py310 py311 + py312 + py313 min_version = 4.5.1 skip_missing_interpreters = true no_package = false @@ -21,3 +23,5 @@ python = 3.9 = py39 3.10 = py310 3.11 = py311 + 3.12 = py312 + 3.13 = py313 From 71a058db811bf5771f4e786a09a9c3b3b438a3b8 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:37:25 -0500 Subject: [PATCH 07/24] Remove default_language_version --- .pre-commit-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 59ce8b06..9d013887 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,3 @@ -default_language_version: - python: python3.8 repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v5.0.0 From 86f2891cd092af4b31c5d214bba7dbc71c289cb2 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:38:13 -0500 Subject: [PATCH 08/24] Update dev dependencies --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e23c8814..2710f20c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,14 +48,14 @@ dependencies = [ [project.optional-dependencies] tests = [ - "pytest>=7.3.1,<8.0", - "pytest-cov>=4.0.0,<5.0", + "pytest>=7.3.1,<9.0", + "pytest-cov>=5.0.0,<6.0", # pytest-cov >= 6.0 drops python 3.8 support "tox>=4.5.1,<5.0", # Should keep in sync with tox.ini minimum_version ] dev = [ "hatchling>=1.14.2,<2.0", - "pre-commit>=3.3.1,<4.0", + "pre-commit>=3.3.1,<5.0", "scos-tekrsa[tests]", ] From d46a9c473bcf5c3917e029191aa76e43480aca11 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:38:21 -0500 Subject: [PATCH 09/24] Run pre-commit on all files --- src/scos_tekrsa/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scos_tekrsa/__init__.py b/src/scos_tekrsa/__init__.py index 6cb1c69d..fb16410a 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1,2 +1 @@ __version__ = "7.0.1" - From f6070e4059cb515cc34c3241c5cfc29711980f10 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:09:55 -0500 Subject: [PATCH 10/24] Remove default_language_version --- .pre-commit-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index df297783..e27679e5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,5 +1,3 @@ -default_language_version: - python: python3.8 repos: - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.5.0 From f042bc7b82715241b52040635c4f739abed2fad2 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:12:16 -0500 Subject: [PATCH 11/24] Suppress warnings when building docker image --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9130e256..39ae2d01 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,5 +7,5 @@ RUN echo "SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0699\", MODE=\"0666\", GROUP=\"p RUN chmod a+r /etc/udev/rules.d/Tektronix.rules # Locale fixes -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 +ENV LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 From 9cbecfe5800d6fb9cd91e24fa0b165aca4f6c567 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:13:59 -0500 Subject: [PATCH 12/24] Update pre-commit hooks --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e27679e5..93e32b3a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v5.0.0 hooks: - id: check-ast types: [file, python] @@ -16,10 +16,10 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/asottile/pyupgrade - rev: v3.15.2 + rev: v3.19.0 hooks: - id: pyupgrade - args: ["--py38-plus"] + args: ["--py39-plus"] - repo: https://github.com/pycqa/isort rev: 5.13.2 hooks: @@ -28,12 +28,12 @@ repos: types: [file, python] args: ["--profile", "black", "--filter-files", "--gitignore"] - repo: https://github.com/psf/black - rev: 24.4.2 + rev: 24.10.0 hooks: - id: black types: [file, python] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.40.0 + rev: v0.41.0 hooks: - id: markdownlint types: [file, markdown] From f1a454ae4ed3b6bc847224aeef50341a528bf9fe Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:19:10 -0500 Subject: [PATCH 13/24] Drop Python 3.8, support Python 3.12 --- .github/workflows/build-docker-image.yaml | 4 ++-- .github/workflows/tox.yaml | 8 ++++---- README.md | 4 ++-- pyproject.toml | 12 ++++++------ tox.ini | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml index ef0c90e7..5483742b 100644 --- a/.github/workflows/build-docker-image.yaml +++ b/.github/workflows/build-docker-image.yaml @@ -19,9 +19,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build tekrsa_usb Docker image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: push: false tags: tekrsa_usb diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml index 231ad3d6..cef230ba 100644 --- a/.github/workflows/tox.yaml +++ b/.github/workflows/tox.yaml @@ -31,19 +31,19 @@ jobs: fail-fast: false matrix: os: - - ubuntu-20.04 + - ubuntu-22.04 py: - - "3.8" - "3.9" - "3.10" - "3.11" + - "3.12" steps: - name: Set up Python ${{ matrix.py }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.py }} - name: Checkout scos-tekrsa - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install tox-gh run: python -m pip install tox-gh - name: Set up test suite diff --git a/README.md b/README.md index 169cc73d..f190e550 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Tektronix RSA devices, along with supporting test code ## Running in SCOS Sensor -Requires `git`, `python>=3.8`, `pip>=18.1`, and `pip-tools>=6.6.2` +Requires `git`, `python>=3.9`, `pip>=18.1`, and `pip-tools>=6.6.2` Below are the steps to run SCOS Sensor with the SCOS Tektronix RSA plugin: @@ -149,7 +149,7 @@ from Tektronix. Place the three files `libRSA_API.so`, `libcyusb_shared.so`, and Set up a development environment using a tool like [Conda](https://docs.conda.io/en/latest/) -or [venv](https://docs.python.org/3/library/venv.html#module-venv), with `python>=3.8`. +or [venv](https://docs.python.org/3/library/venv.html#module-venv), with `python>=3.9`. Then, from the cloned directory, install the development dependencies by running: ```bash diff --git a/pyproject.toml b/pyproject.toml index c8bde58e..8c1f2642 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "scos-tekrsa" dynamic = ["version"] description = "Plugin for SCOS Sensor which adds support for Tektronix RSA-series spectrum analyzers" readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.9" license = { file = "LICENSE.md" } authors = [ @@ -32,28 +32,28 @@ classifiers = [ "Environment :: Plugins", "Programming Language :: Python", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-234_ubuntu22.04_python3.10_ray2.10", + "scos_actions @ git+https://github.com/NTIA/scos-actions@drop-python-3.8", ] [project.optional-dependencies] tests = [ - "pytest>=7.3.1,<8.0", - "pytest-cov>=4.0.0,<5.0", + "pytest>=8.0,<9.0", + "pytest-cov>=6.0,<7.0", "tox>=4.5.1,<5.0", # Should keep in sync with tox.ini minimum_version ] dev = [ "hatchling>=1.14.2,<2.0", - "pre-commit>=3.3.1,<4.0", + "pre-commit>=4.0,<5.0", "scos-tekrsa[tests]", ] diff --git a/tox.ini b/tox.ini index 744e82ac..9be29463 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,9 @@ [tox] env_list = - py38 py39 py310 py311 + py312 min_version = 4.5.1 skip_missing_interpreters = true no_package = false @@ -17,7 +17,7 @@ commands = pytest --cov-report term-missing --no-cov-on-fail --cov {posargs} [gh] ; GitHub Actions CI with tox-gh python = - 3.8 = py38 3.9 = py39 3.10 = py310 3.11 = py311 + 3.12 = py312 From 1031f43911de063457286baea5e28ddc0002a110 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:20:17 -0500 Subject: [PATCH 14/24] Run pre-commit hooks on all files --- src/scos_tekrsa/__init__.py | 1 - src/scos_tekrsa/hardware/tekrsa_sigan.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/scos_tekrsa/__init__.py b/src/scos_tekrsa/__init__.py index 6cb1c69d..fb16410a 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1,2 +1 @@ __version__ = "7.0.1" - diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 56c4d9f3..d06fb23b 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -1,6 +1,6 @@ import logging import threading -from typing import Dict, Optional +from typing import Optional from its_preselector.web_relay import WebRelay from scos_actions import utils @@ -20,7 +20,7 @@ class TekRSASigan(SignalAnalyzerInterface): def __init__( self, - switches: Optional[Dict[str, WebRelay]] = None, + switches: Optional[dict[str, WebRelay]] = None, ): try: From d494d005142ce6acbf27a81b947847dc982a8995 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:23:23 -0500 Subject: [PATCH 15/24] Update version to 8.0.0 --- 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 fb16410a..73d4c8be 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "7.0.1" +__version__ = "8.0.0" From 7894407f78a6fe424b601f9c82dc28c0bb3304e7 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:25:11 -0500 Subject: [PATCH 16/24] Update pre-commit hook --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 93e32b3a..dcbcc41d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -33,7 +33,7 @@ repos: - id: black types: [file, python] - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.41.0 + rev: v0.42.0 hooks: - id: markdownlint types: [file, markdown] From 0d8ce0a6249390dea1ddc3d11d9f87a6b1c53b8a Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:06:43 -0500 Subject: [PATCH 17/24] Update scos-actions branch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c8bde58e..6a716c62 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-234_ubuntu22.04_python3.10_ray2.10", + "scos_actions @ git+https://github.com/NTIA/scos-actions@master", ] [project.optional-dependencies] From 560c15a8abc92aea7592887b0b4925c3b04aa623 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:51:08 -0500 Subject: [PATCH 18/24] Update branch after scos-actions PR merge --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 8c1f2642..a5eb0034 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@drop-python-3.8", + "scos_actions @ git+https://github.com/NTIA/scos-actions@master", ] [project.optional-dependencies] From 692cf5b57fa240361b465c2ba48f75770d3fb3a8 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:51:57 -0500 Subject: [PATCH 19/24] temporarily bump version to trigger CI --- 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 73d4c8be..9e17e009 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "8.0.0" +__version__ = "8.0.1" From 51e731e13b7c50ee8b8f84279bc1fd33a1de9e63 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:52:10 -0500 Subject: [PATCH 20/24] Revert temporary version change --- 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 9e17e009..73d4c8be 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "8.0.1" +__version__ = "8.0.0" From 80129974c964bb9abe0ad87021f2b08bd288d2b3 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:52:43 -0500 Subject: [PATCH 21/24] temporarily bump version to trigger CI --- 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 73d4c8be..9e17e009 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "8.0.0" +__version__ = "8.0.1" From 5d57c49029f9923c3174ab7f2b815901d65fd162 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:53:06 -0500 Subject: [PATCH 22/24] Revert temporary version change --- 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 9e17e009..73d4c8be 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "8.0.1" +__version__ = "8.0.0" From af9da71d5db176066460235281ea516f990b74b0 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:16:47 -0500 Subject: [PATCH 23/24] Update versions and docker build instructions in readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f190e550..baa54e97 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,8 @@ file: (such as `scos_usrp`), then add the `scos_tekrsa` dependency: ```text - scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@3.0.1 + # Be sure to provide the correct tag for the desired version + scos_tekrsa @ git+https://github.com/NTIA/scos-tekrsa@8.0.0 ``` 1. Compile requirements by running: @@ -195,7 +196,9 @@ Registry, run: ```bash docker build -f docker/Dockerfile -t tekrsa_usb . docker tag tekrsa_usb ghcr.io/ntia/scos-tekrsa/tekrsa_usb:X.X.X +docker tag tekrsa_usb ghcr.io/ntia/scos-tekrsa/tekrsa_usb:latest docker push ghcr.io/ntia/scos-tekrsa/tekrsa_usb:X.X.X +docker push ghcr.io/ntia/scos-tekrsa/tekrsa_usb:latest ``` ### Running Tests From d0388ca69f8b7767cd6061d5995a058644e1f494 Mon Sep 17 00:00:00 2001 From: Anthony Romaniello <66272872+aromanielloNTIA@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:45:00 -0500 Subject: [PATCH 24/24] Update scos-actions to 11.0.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2dfa9227..5c725148 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.3", - "scos_actions @ git+https://github.com/NTIA/scos-actions@cal_NAN_prevention", + "scos_actions @ git+https://github.com/NTIA/scos-actions@11.0.0", ] [project.optional-dependencies]