Skip to content

Commit

Permalink
feat: django 4.2 & main testing (#157)
Browse files Browse the repository at this point in the history
* ci: Added testing against django 4.2 and main

* Bump version: 4.0.0 → 4.1.0
  • Loading branch information
marksweb authored May 2, 2023
1 parent efa7dcc commit 9f9a11a
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 7 deletions.
36 changes: 35 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand All @@ -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
8 changes: 6 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
================
Expand Down
2 changes: 1 addition & 1 deletion sekizai/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '4.0.0'
__version__ = '4.1.0'
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.0.0
current_version = 4.1.0
commit = True
tag = False

Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -36,7 +38,7 @@

setup(
name='django-sekizai',
version='4.0.0',
version='4.1.0',
author='Jonas Obrist',
author_email='[email protected]',
maintainer='Django CMS Association and contributors',
Expand Down
9 changes: 8 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 9f9a11a

Please sign in to comment.