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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c209e23..258c252 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,13 +1,11 @@ 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' diff --git a/tox.ini b/tox.ini index a4d2f65..e44ceec 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 @@ -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 @@ -26,10 +28,10 @@ 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 + python3 -m pip install -r /tmp/caldera/requirements-dev.txt /usr/bin/cp -R {toxinidir} /tmp/caldera/plugins/emu - python -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 + 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