From e0fe98f647e877c72dd47f9b49b21cb453b5f868 Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:20:44 -0400 Subject: [PATCH 1/8] Update testing.yml --- .github/workflows/testing.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6046330..6155f29 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -9,21 +9,19 @@ jobs: fail-fast: false matrix: include: - - python-version: 3.8 - toxenv: py38,style,coverage-ci - - python-version: 3.9 - toxenv: py39,style,coverage-ci - python-version: 3.10.9 toxenv: py310,style,coverage-ci - python-version: 3.11 toxenv: py311,style,coverage-ci + - python-version: 3.12 + toxenv: py312,style,coverage-ci steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 with: submodules: recursive - name: Setup python - uses: actions/setup-python@v2 + uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c with: python-version: ${{ matrix.python-version }} - name: Install dependencies From a3f517a8f0e116e1519590e2ff1a8c82b3e5b409 Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:29:15 -0400 Subject: [PATCH 2/8] Update tox.ini --- tox.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index a4d2f65..3d80114 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ [tox] skipsdist = True envlist = - py{38,39,310,311} + py{39,310,311,312} style coverage bandit @@ -26,9 +26,9 @@ changedir = /tmp/caldera commands = /usr/bin/git clone https://github.com/mitre/caldera.git --recursive /tmp/caldera /bin/rm -rf /tmp/caldera/plugins/emu - python -m pip install -r /tmp/caldera/requirements.txt + python3 -m pip install -r /tmp/caldera/requirements.txt /usr/bin/cp -R {toxinidir} /tmp/caldera/plugins/emu - python -m pip install -r /tmp/caldera/plugins/emu/requirements.txt + python3 -m pip install -r /tmp/caldera/plugins/emu/requirements.txt coverage run -p -m pytest --tb=short --rootdir=/tmp/caldera /tmp/caldera/plugins/emu/tests -W ignore::DeprecationWarning allowlist_externals = /usr/bin/git From 8a052e234b8f8c998346be6e6698d92dbeae470a Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:34:46 -0400 Subject: [PATCH 3/8] Update tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 3d80114..f6343df 100644 --- a/tox.ini +++ b/tox.ini @@ -16,9 +16,11 @@ skip_missing_interpreters = true description = run tests passenv = TOXENV,CI,TRAVIS,TRAVIS_*,CODECOV_* deps = + -rrequirements.txt virtualenv!=20.0.22 pre-commit pytest + pytest-asyncio==0.26.0 pytest-aiohttp coverage codecov @@ -27,8 +29,6 @@ commands = /usr/bin/git clone https://github.com/mitre/caldera.git --recursive /tmp/caldera /bin/rm -rf /tmp/caldera/plugins/emu python3 -m pip install -r /tmp/caldera/requirements.txt - /usr/bin/cp -R {toxinidir} /tmp/caldera/plugins/emu - python3 -m pip install -r /tmp/caldera/plugins/emu/requirements.txt coverage run -p -m pytest --tb=short --rootdir=/tmp/caldera /tmp/caldera/plugins/emu/tests -W ignore::DeprecationWarning allowlist_externals = /usr/bin/git From 63d1d5df375c08b029a086df7a304e534edf5cdc Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:51:43 -0400 Subject: [PATCH 4/8] Update tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index f6343df..7a4c3b8 100644 --- a/tox.ini +++ b/tox.ini @@ -29,6 +29,7 @@ commands = /usr/bin/git clone https://github.com/mitre/caldera.git --recursive /tmp/caldera /bin/rm -rf /tmp/caldera/plugins/emu python3 -m pip install -r /tmp/caldera/requirements.txt + /usr/bin/cp -R {toxinidir} /tmp/caldera/plugins/emu coverage run -p -m pytest --tb=short --rootdir=/tmp/caldera /tmp/caldera/plugins/emu/tests -W ignore::DeprecationWarning allowlist_externals = /usr/bin/git From 561304e9f3ed104fbba614bacb243b18a781b7a8 Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:52:18 -0400 Subject: [PATCH 5/8] Update .pre-commit-config.yaml --- .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 c209e23..b2ae303 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,13 @@ repos: - - repo: https://github.com/pycqa/flake8 - rev: 5.0.4 + - repo: https://github.com/PyCQA/flake8 + rev: 7.0.0 hooks: - id: flake8 additional_dependencies: [flake8-bugbear] - repo: https://github.com/PyCQA/bandit - rev: 1.7.4 + rev: 1.7.7 hooks: - id: bandit entry: bandit -ll --exclude=tests/ --skip=B303 additional_dependencies: - - importlib-metadata<5; python_version < '3.8' + - importlib-metadata<5; python_version < '3.9' From 5451d6ad46ad5fe921b5e43cd1b3f4621b8493ae Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:56:40 -0400 Subject: [PATCH 6/8] Update tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 7a4c3b8..910faff 100644 --- a/tox.ini +++ b/tox.ini @@ -29,6 +29,7 @@ commands = /usr/bin/git clone https://github.com/mitre/caldera.git --recursive /tmp/caldera /bin/rm -rf /tmp/caldera/plugins/emu python3 -m pip install -r /tmp/caldera/requirements.txt + python3 -m pip install -r /tmp/caldera/requirements-dev.txt /usr/bin/cp -R {toxinidir} /tmp/caldera/plugins/emu coverage run -p -m pytest --tb=short --rootdir=/tmp/caldera /tmp/caldera/plugins/emu/tests -W ignore::DeprecationWarning allowlist_externals = From 2443d5eefa4903431303a4078568e6e4122a4306 Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 11:02:07 -0400 Subject: [PATCH 7/8] add auto asyncio mode for tests --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 910faff..e44ceec 100644 --- a/tox.ini +++ b/tox.ini @@ -31,7 +31,7 @@ commands = python3 -m pip install -r /tmp/caldera/requirements.txt python3 -m pip install -r /tmp/caldera/requirements-dev.txt /usr/bin/cp -R {toxinidir} /tmp/caldera/plugins/emu - coverage run -p -m pytest --tb=short --rootdir=/tmp/caldera /tmp/caldera/plugins/emu/tests -W ignore::DeprecationWarning + coverage run -p -m pytest --tb=short --rootdir=/tmp/caldera --asyncio-mode=auto /tmp/caldera/plugins/emu/tests -W ignore::DeprecationWarning allowlist_externals = /usr/bin/git /usr/bin/cp From c230044f4c74b1adfb3ca408c80a9db5d8326307 Mon Sep 17 00:00:00 2001 From: Daniel Matthews <58484522+uruwhy@users.noreply.github.com> Date: Fri, 26 Sep 2025 11:57:28 -0400 Subject: [PATCH 8/8] remove unneeded line --- .pre-commit-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b2ae303..258c252 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,5 +9,3 @@ repos: hooks: - id: bandit entry: bandit -ll --exclude=tests/ --skip=B303 - additional_dependencies: - - importlib-metadata<5; python_version < '3.9'