From 8ae2d8e4e474fd8b0056f22cf46b5d93f5435c38 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 21:47:57 +0100 Subject: [PATCH 01/12] Update test.yml --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3521825..e4c475c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,9 +9,9 @@ jobs: fail-fast: false matrix: python-version: ['3.8', '3.9', '3.10'] - django-version: ['3.2', '4.0', '4.1'] + django-version: ['3.2', '4.2', '5.0', '5.1'] os: [ - ubuntu-20.04, + ubuntu-latest, ] steps: @@ -27,7 +27,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run tests/settings.py - name: Upload Coverage to Codecov uses: codecov/codecov-action@v1 @@ -43,7 +43,7 @@ jobs: 'https://github.com/django/django/archive/main.tar.gz' ] os: [ - ubuntu-20.04, + ubuntu-latest, ] steps: @@ -60,7 +60,7 @@ jobs: python setup.py install - name: Run coverage - run: coverage run setup.py test + run: coverage run tests/settings.py continue-on-error: true - name: Upload Coverage to Codecov From 7196bc52e444852d93393668d617bb4e86af78c8 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 21:49:13 +0100 Subject: [PATCH 02/12] Update tox.ini --- tox.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tox.ini b/tox.ini index fe9a463..6fd77fb 100644 --- a/tox.ini +++ b/tox.ini @@ -11,14 +11,14 @@ skip_missing_interpreters=True deps = -r{toxinidir}/tests/requirements/base.txt dj32: Django>=3.2,<3.3 - dj40: Django>=4.0,<4.1 - dj41: Django>=4.1,<4.2 - dj42: Django>=4.2,<5.0 + dj42: Django>=4.2,<4.3 + dj50: Django>=5.0,<4.1 + dj51: Django>=5.1,<5.2 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} run tests/settings.py {env:COMMAND:coverage} report ignore_outcome = djmain: True From 68a728b27bb4a15254adaeee11cfd2ff82b461fb Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 21:53:48 +0100 Subject: [PATCH 03/12] Update test.yml --- .github/workflows/test.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e4c475c..e48f6b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,12 +8,16 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] django-version: ['3.2', '4.2', '5.0', '5.1'] os: [ - ubuntu-latest, + ubuntu-latest ] - + exclude: + - django-version: '5.0' + python-version: 3.9 + - django-version: '5.1' + python-version: 3.9 steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -23,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install django==${{ matrix.django-version }} coverage + pip install django~=${{ matrix.django-version }} coverage python setup.py install - name: Run coverage From f16cc53b18c6f39e119c1ddc5853dce0dff7be4e Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 21:55:46 +0100 Subject: [PATCH 04/12] Update tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 6fd77fb..3a0a8fc 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ deps = -r{toxinidir}/tests/requirements/base.txt dj32: Django>=3.2,<3.3 dj42: Django>=4.2,<4.3 - dj50: Django>=5.0,<4.1 + dj50: Django>=5.0,<5.1 dj51: Django>=5.1,<5.2 djmain: https://github.com/django/django/archive/main.tar.gz commands = From 8162b96146df4eed587f5a194cc38c552e0f2310 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:01:08 +0100 Subject: [PATCH 05/12] Update settings.py --- tests/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/settings.py b/tests/settings.py index c015961..1c7c88d 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -59,4 +59,7 @@ def run(): if __name__ == '__main__': + import sys + # Add current directory to python path - works if this script is called python tests/settings,.py + sys.path.insert(0, '.') run() From e159e8c2a9ee2dc095f69acf293cd59b44af8c8b Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:02:24 +0100 Subject: [PATCH 06/12] Update base.txt --- tests/requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/requirements/base.txt b/tests/requirements/base.txt index 9ec156a..76c9bd3 100644 --- a/tests/requirements/base.txt +++ b/tests/requirements/base.txt @@ -2,3 +2,4 @@ tox coverage flake8 +setuptools From 6784f7e343ce7124e755378e7797958b914ba8db Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:04:13 +0100 Subject: [PATCH 07/12] Update tests/settings.py --- tests/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/settings.py b/tests/settings.py index 1c7c88d..b9643e1 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -60,6 +60,6 @@ def run(): if __name__ == '__main__': import sys - # Add current directory to python path - works if this script is called python tests/settings,.py + # Add current directory to python path - works if this script is called python tests/settings,.py sys.path.insert(0, '.') run() From 132a3e89f2f3f1da3a7464b8da0237026a19a22c Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:04:41 +0100 Subject: [PATCH 08/12] Update tests/settings.py --- tests/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/settings.py b/tests/settings.py index b9643e1..1719f08 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -59,7 +59,6 @@ def run(): if __name__ == '__main__': - import sys # Add current directory to python path - works if this script is called python tests/settings,.py sys.path.insert(0, '.') run() From 1bd2fa031e117c001f8d06be739614505b88edbf Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:06:11 +0100 Subject: [PATCH 09/12] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index ccd7508..f4e0d18 100644 --- a/README.rst +++ b/README.rst @@ -72,7 +72,7 @@ You can run tests by executing:: .. |coverage| image:: https://codecov.io/gh/divio/django-sekizai/branch/master/graph/badge.svg :target: https://codecov.io/gh/divio/django-sekizai -.. |python| image:: https://img.shields.io/badge/python-3.5+-blue.svg +.. |python| image:: https://img.shields.io/badge/python-3.9+-blue.svg :target: https://pypi.org/project/django-sekizai/ -.. |django| image:: https://img.shields.io/badge/django-2.2,%203.0,%203.1-blue.svg +.. |django| image:: https://img.shields.io/badge/django-4.2,%205.0,%205.1-blue.svg :target: https://www.djangoproject.com/ From 63eb0be9520ae9c57f768e6950f5e28091307cac Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:08:36 +0100 Subject: [PATCH 10/12] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e48f6b3..7c16c7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -61,6 +61,7 @@ jobs: run: | python -m pip install --upgrade pip pip install ${{ matrix.django-version }} coverage + pip install -r tests/requirements/base.txt python setup.py install - name: Run coverage From 3f0878867a3d847c4ddc2ebc38eef86621fbbeca Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:10:31 +0100 Subject: [PATCH 11/12] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7c16c7f..acc3c04 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,7 @@ jobs: run: | python -m pip install --upgrade pip pip install django~=${{ matrix.django-version }} coverage + pip install -r tests/requirements/base.txt python setup.py install - name: Run coverage From cca00561a0bb7fa058cf7a0eb623396bf1c097d6 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 29 Nov 2024 22:12:15 +0100 Subject: [PATCH 12/12] Update test.yml --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index acc3c04..ab04e1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,9 +15,11 @@ jobs: ] exclude: - django-version: '5.0' - python-version: 3.9 + python-version: '3.9' - django-version: '5.1' - python-version: 3.9 + python-version: '3.9' + - django-version: '3.2' + python-version: '3.13' steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }}