From e97bbd9782c1f77b353f948bcdc014fc7c85b433 Mon Sep 17 00:00:00 2001 From: Joe Testa Date: Tue, 24 Sep 2024 18:20:07 -0400 Subject: [PATCH] Added Python 3.13 support. --- .github/workflows/tox.yaml | 6 +++--- README.md | 1 + setup.cfg | 1 + src/ssh_audit/ssh_audit.py | 2 +- tox.ini | 16 ++++++++-------- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tox.yaml b/.github/workflows/tox.yaml index e1506e4..73c9213 100644 --- a/.github/workflows/tox.yaml +++ b/.github/workflows/tox.yaml @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/README.md b/README.md index 28c576d..f392c9f 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,7 @@ For convenience, a web front-end on top of the command-line tool is available at ## ChangeLog ### v3.3.0-dev (???) + - Added Python 3.13 support. - Added built-in policies for Ubuntu 24.04 LTS server & client, OpenSSH 9.8, and OpenSSH 9.9. - Added IPv6 support for DHEat and connection rate tests. - Added TCP port information to JSON policy scan results; credit [Fabian Malte Kopp](https://github.com/dreizehnutters). diff --git a/setup.cfg b/setup.cfg index 975b460..98168f3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,6 +24,7 @@ classifiers = Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy Topic :: Security diff --git a/src/ssh_audit/ssh_audit.py b/src/ssh_audit/ssh_audit.py index c7f22a0..f163c5f 100755 --- a/src/ssh_audit/ssh_audit.py +++ b/src/ssh_audit/ssh_audit.py @@ -25,7 +25,7 @@ """ import concurrent.futures import copy -import getopt +import getopt # pylint: disable=deprecated-module import json import multiprocessing import os diff --git a/tox.ini b/tox.ini index 61b6af1..4b05c79 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py{py3}-{test,pylint,flake8} - py{38,39,310,311,312}-{test,mypy,pylint,flake8} + py{38,39,310,311,312,313}-{test,mypy,pylint,flake8} cov skip_missing_interpreters = true @@ -9,10 +9,10 @@ skip_missing_interpreters = true deps = test: pytest test,cov: {[testenv:cov]deps} - test,py{38,39,310,311,312}-{type,mypy}: colorama - py{38,39,310,311,312}-{type,mypy}: {[testenv:mypy]deps} - py{py3,38,39,310,311,312}-{lint,pylint},lint: {[testenv:pylint]deps} - py{py3,38,39,310,311,312}-{lint,flake8},lint: {[testenv:flake8]deps} + test,py{38,39,310,311,312,313}-{type,mypy}: colorama + py{38,39,310,311,312,313}-{type,mypy}: {[testenv:mypy]deps} + py{py3,38,39,310,311,312,313}-{lint,pylint},lint: {[testenv:pylint]deps} + py{py3,38,39,310,311,312,313}-{lint,flake8},lint: {[testenv:flake8]deps} setenv = SSHAUDIT = {toxinidir}/src test: COVERAGE_FILE = {toxinidir}/.coverage.{envname} @@ -24,9 +24,9 @@ commands = test: coverage combine test: coverage report --show-missing test: coverage html -d {toxinidir}/reports/html/coverage.{envname} - py{38,39,310,311,312}-{type,mypy}: {[testenv:mypy]commands} - py{py3,38,39,310,311,312}-{lint,pylint},lint: {[testenv:pylint]commands} - py{py3,38,39,310,311,312}-{lint,flake8},lint: {[testenv:flake8]commands} + py{38,39,310,311,312,313}-{type,mypy}: {[testenv:mypy]commands} + py{py3,38,39,310,311,312,313}-{lint,pylint},lint: {[testenv:pylint]commands} + py{py3,38,39,310,311,312,313}-{lint,flake8},lint: {[testenv:flake8]commands} #ignore_outcome = # type: true