diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bbbe9f0..3521825 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false matrix: python-version: ['3.8', '3.9', '3.10'] - django-version: ['3.2', '4.0', '4.1rc1'] + django-version: ['3.2', '4.0', '4.1'] os: [ ubuntu-20.04, ] @@ -31,3 +31,37 @@ jobs: - name: Upload Coverage to Codecov uses: codecov/codecov-action@v1 + + unit-tests-future-versions: + # Runs for all Django/Python versions which are not yet supported + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + python-version: ['3.10', '3.11'] + django-version: [ + 'https://github.com/django/django/archive/main.tar.gz' + ] + os: [ + ubuntu-20.04, + ] + + steps: + - uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install ${{ matrix.django-version }} coverage + python setup.py install + + - name: Run coverage + run: coverage run setup.py test + continue-on-error: true + + - name: Upload Coverage to Codecov + uses: codecov/codecov-action@v3 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 452a460..c0ca392 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,12 @@ Changelog unreleased ========== -* Fix bug which let checks fail on templates using - the with_data template tag. +4.1.0 2023-05-02 +================ + +* Added django 4.2 and main to the test suite +* Fix bug which let checks fail on templates using + the with_data template tag. 4.0.0 2022-07-26 ================ diff --git a/sekizai/__init__.py b/sekizai/__init__.py index d6497a8..fa721b4 100644 --- a/sekizai/__init__.py +++ b/sekizai/__init__.py @@ -1 +1 @@ -__version__ = '4.0.0' +__version__ = '4.1.0' diff --git a/setup.cfg b/setup.cfg index 5ece948..607ca11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 4.0.0 +current_version = 4.1.0 commit = True tag = False diff --git a/setup.py b/setup.py index 773a254..b8acf0a 100644 --- a/setup.py +++ b/setup.py @@ -21,10 +21,12 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Framework :: Django', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.0', 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', @@ -36,7 +38,7 @@ setup( name='django-sekizai', - version='4.0.0', + version='4.1.0', author='Jonas Obrist', author_email='ojiidotch@gmail.com', maintainer='Django CMS Association and contributors', diff --git a/tox.ini b/tox.ini index f7ca3b7..fe9a463 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,7 @@ envlist = flake8 isort py{38,39,310}-dj{32,40,41} + py{310,311}-dj{42,main} skip_missing_interpreters=True @@ -11,12 +12,18 @@ deps = -r{toxinidir}/tests/requirements/base.txt dj32: Django>=3.2,<3.3 dj40: Django>=4.0,<4.1 - dj41: Django>=4.1rc1,<4.2 + dj41: Django>=4.1,<4.2 + dj42: Django>=4.2,<5.0 + djmain: https://github.com/django/django/archive/main.tar.gz commands = {envpython} --version {env:COMMAND:coverage} erase {env:COMMAND:coverage} run setup.py test {env:COMMAND:coverage} report +ignore_outcome = + djmain: True +ignore_errors = + djmain: True [testenv:flake8] deps = flake8