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 1/7] 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 02f6ced..95f9578 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 2/7] 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 df29778..59ce8b0 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 3/7] 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 231ad3d..daadec0 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 95f9578..e23c881 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 744e82a..8398ec1 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 4/7] 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 59ce8b0..9d01388 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 5/7] Update dev dependencies --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e23c881..2710f20 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 6/7] 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 6cb1c69..fb16410 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1,2 +1 @@ __version__ = "7.0.1" - 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 7/7] 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 2dfa922..5c72514 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]