diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 98ddd44..bade5f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - python: ["3.8", "3.9", "3.10", "3.11"] + python: ["3.8", "3.9", "3.10", "3.11", "3.12"] experimental: [false] toxenv: ["py"] include: @@ -26,7 +26,7 @@ jobs: toxenv: isort experimental: false # Future Wagtail release from main branch (allowed to fail) - - python: "3.11" + - python: "3.12" toxenv: wagtailmain experimental: true steps: @@ -37,7 +37,7 @@ jobs: python-version: ${{ matrix.python }} - name: Install dependencies run: | - python -m pip install tox tox-py + python -m pip install setuptools tox tox-py # This step runs only for jobs NOT in the include matrix - name: Run tox targets for Python ${{ matrix.python }} diff --git a/README.md b/README.md index e874dcd..0ea8642 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ If you want to send an encrypted email (optional), the public key ID for securit ## Supported Versions -- Python 3.8 - 3.11 +- Python 3.8 - 3.12 - Django 3.2 - 4.2 - Wagtail >= 4.1 diff --git a/setup.cfg b/setup.cfg index cd31465..253a633 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,6 +30,3 @@ known_third_party=bakery,django,factory,pytest,wagtail [tool:pytest] testpaths=tests - -[wheel] -universal=1 diff --git a/setup.py b/setup.py index 31d3761..3baf892 100644 --- a/setup.py +++ b/setup.py @@ -52,5 +52,6 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], ) diff --git a/tests/conftest.py b/tests/conftest.py index 78b46bc..8a5bd49 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -90,4 +90,5 @@ def pytest_configure(): 'wagtailbakery.views.AllPagesView', ), CELERY_ALWAYS_EAGER=True, + STATIC_URL="/static/", ) diff --git a/tox.ini b/tox.ini index 6ee2172..6f2fd87 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,9 @@ linting_folders=src/wagtailbakery/ tests/ examples/ [tox] envlist= - py{38,39,310,311}-django{32,40,41}-wagtail{41,42} # Wagtail 4.1 LTS and 4.2 - all supported Python - all Django - py{38,39,310,311}-django{32,41,42}-wagtail50 # Wagtail 5.0 - all supported Python - all Django - wagtailmain # Wagtail main latest compatible version + py{38,39,310,311}-django{32,40,41}-wagtail41 # Wagtail 4.1 LTS - all supported Python - all Django + py{38,39,310,311,312}-django{32,41,42}-wagtail{50,51,52} # Wagtail 5.0, 5.1 and 5.2 LTS - all supported Python - all Django + wagtailmain # Wagtail main latest compatible version [testenv] commands=py.test --cov=wagtailbakery --cov-report=xml {posargs} @@ -13,9 +13,11 @@ deps= django32: django>=3.2,<3.3 django40: django>=4.0,<4.1 django41: django>=4.1,<4.2 - wagtail41: wagtail>=4.1,<4.2 # Current LTS - wagtail42: wagtail>=4.2,<5.0 - wagtail50: wagtail>=5.0rc1,<5.1 + django42: django>=4.2,<5 + wagtail41: wagtail>=4.1,<4.2 # Previous LTS + wagtail50: wagtail>=5.0,<5.1 + wagtail51: wagtail>=5.1,<5.2 + wagtail52: wagtail>=5.2,<5.3 # Current LTS extras=test [testenv:wagtailmain]