diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3adcd4d..fe5b4e0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,10 +22,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] - # python-version: ['3.9'] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: shogo82148/actions-setup-redis@v1 with: @@ -33,7 +32,7 @@ jobs: - run: redis-cli ping - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6ce0276..8fee60f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,11 +10,11 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: "3.11" - name: install dependencies run: make dev diff --git a/tox.ini b/tox.ini index c438d2e..65d2bd7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,21 +1,23 @@ [tox] -skipsdist = False -usedevelop = True -envlist = py3 +isolated_build = true +skipsdist = true +usedevelop = true +envlist = {py38, py39, py310, py311}-django40, {py38, py39, py310, py311, py312}-django42 [testenv] setenv = - DJANGO_SETTINGS_MODULE = tests.test_settings - -basepython = - py3: python3 - + django40: DJANGO_SETTINGS_MODULE = tests.test_settingsAA3 + django42: DJANGO_SETTINGS_MODULE = tests.test_settingsAA4 deps= + django40: allianceauth<4 + django42: allianceauth>=4.0.0 coverage -commands = - pip freeze - coverage run runtests.py - coverage report -m - coverage html +install_command = pip install -e ".[test]" -U {opts} {packages} + +commands= + coverage run runtests.py allianceauth_oidc -v 2 --debug-mode + pip list coverage xml + coverage html + coverage report -m