Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksihakli authored Jan 7, 2025
2 parents 60b338e + 2e5d260 commit 8040e97
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
max-parallel: 5
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
django-version: ['3.2', '4.1', '4.2', '5.0']
django-version: ['3.2', '4.1', '4.2', '5.0', '5.1']
include:
# Tox configuration for QA environment
- python-version: '3.11'
Expand All @@ -29,11 +29,15 @@ jobs:
# Exclude Django 3.2 for Python 3.11
- python-version: '3.11'
django-version: '3.2'
# Django 5.0 doesn't support < Python 3.10
# Django 5.0/5.1 don't support < Python 3.10
- python-version: '3.8'
django-version: '5.0'
- python-version: '3.9'
django-version: '5.0'
- python-version: '3.8'
django-version: '5.1'
- python-version: '3.9'
django-version: '5.1'

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Framework :: Django :: 5.1",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python",
Expand Down
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ envlist =
py{38,39,310,311}-dj41
py{38,39,310,311}-dj42
py{310,311,312}-dj50
py{310,311,312}-dj51
py{311}-djmain
py{311}-djqa

Expand All @@ -24,6 +25,7 @@ DJANGO =
4.1: dj41
4.2: dj42
5.0: dj50
5.1: dj51
main: djmain
qa: djqa

Expand All @@ -34,6 +36,7 @@ deps =
dj41: django>=4.1,<4.2
dj42: django>=4.2,<4.3
dj50: django>=5.0,<5.1
dj51: django>=5.1,<5.2
djmain: https://github.com/django/django/archive/main.tar.gz
coverage
requests-mock
Expand Down

0 comments on commit 8040e97

Please sign in to comment.