diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 48b6e7202..8a3020226 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,11 +20,12 @@ jobs: - '3.9' - '3.10' - '3.11' + - '3.12' steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' @@ -49,7 +50,7 @@ jobs: run: tox --py current - name: Run extra tox targets - if: ${{ matrix.python-version == '3.9' }} + if: ${{ matrix.python-version == '3.x' }} run: | tox -e base,dist,docs @@ -61,11 +62,11 @@ jobs: name: Test documentation links runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.9' + python-version: '3.x' - name: Install dependencies run: pip install -r requirements/requirements-documentation.txt diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 36d356493..fedfe5d1d 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,13 +11,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.9" - uses: pre-commit/action@v3.0.0 with: diff --git a/tox.ini b/tox.ini index 2b8733d7d..fcdc0cd2c 100644 --- a/tox.ini +++ b/tox.ini @@ -3,8 +3,14 @@ envlist = {py36,py37,py38,py39}-django30 {py36,py37,py38,py39}-django31 {py36,py37,py38,py39,py310}-django32 - {py38,py39,py310}-{django40,django41,django42,djangomain} + {py38,py39}-{django40,django41,django42} + {py310}-{django40,django41,django42,djangomain} {py311}-{django41,django42,djangomain} + {py312}-{django42,djangomain} + ; To enable Django 5.0 testing, uncomment the following lines + ; {py310}-{django40,django41,django42,django50,djangomain} + ; {py311}-{django41,django42,django50,djangomain} + ; {py312}-{django42,django50,djangomain} base dist docs @@ -22,6 +28,7 @@ deps = django40: Django>=4.0,<4.1 django41: Django>=4.1,<4.2 django42: Django>=4.2,<5.0 + django50: Django>=5.0,<5.1 djangomain: https://github.com/django/django/archive/main.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt @@ -46,14 +53,11 @@ deps = -rrequirements/requirements-testing.txt -rrequirements/requirements-documentation.txt -[testenv:py38-djangomain] -ignore_outcome = true - -[testenv:py39-djangomain] -ignore_outcome = true - [testenv:py310-djangomain] ignore_outcome = true [testenv:py311-djangomain] ignore_outcome = true + +[testenv:py312-djangomain] +ignore_outcome = true