Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test matrix #701

Merged
merged 7 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 5 additions & 31 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,17 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
django-version: ['3.2', '4.1', '4.2', '5.0', 'main']
postgres-version: ['11', '12']
mariadb-version: ['10.3', '10.4']
django-version: ['3.2', '4.2', '5.0', 'main']
postgres-version: ['12', '16']
mariadb-version: ['10.6', '10.11', '11.2']
exclude:
# Django <=4.0 doesn't support python 3.11 (https://docs.djangoproject.com/en/4.1/faq/install/)
- python-version: '3.11'
django-version: '3.2'
- python-version: '3.12'
django-version: '3.2'

# Django <=4.2.7 doesn't support python 3.12 (https://docs.djangoproject.com/en/4.1/faq/install/)
- python-version: '3.12'
django-version: '4.1'
- python-version: '3.12' # TODO remove this once Django 4.2.8 is released
django-version: '4.2'

# Django 5.0 doesn't support python <=3.9k (https://docs.djangoproject.com/en/5.0/faq/install/)
# Django 5.0 doesn't support python <=3.9 (https://docs.djangoproject.com/en/5.0/faq/install/)
- python-version: '3.8'
django-version: '5.0'
- python-version: '3.9'
Expand All @@ -38,26 +32,6 @@ jobs:
- django-version: '3.2'
mariadb-version: '10.4'

- django-version: '4.1'
postgres-version: '12'
- django-version: '4.1'
mariadb-version: '10.4'

- django-version: '4.2'
postgres-version: '11'
- django-version: '4.2'
mariadb-version: '10.3'

- django-version: '5.0'
postgres-version: '11'
- django-version: '5.0'
mariadb-version: '10.3'

- django-version: 'main'
postgres-version: '11'
- django-version: 'main'
mariadb-version: '10.3'

services:
postgres:
image: postgres:${{ matrix.postgres-version }}
Expand All @@ -79,7 +53,7 @@ jobs:
MYSQL_ROOT_PASSWORD: mysql
MYSQL_DATABASE: mysql
options: >-
--health-cmd "mysqladmin ping"
--health-cmd "mariadb-admin ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Silk is a live profiling and inspection tool for the Django framework. Silk inte

Silk has been tested with:

* Django: 3.2, 4.1, 4.2, 5.0
* Django: 3.2, 4.2, 5.0
* Python: 3.8, 3.9, 3.10, 3.11, 3.12

## Installation
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ Features
Requirements
------------

* Django: 3.2, 4.1, 4.2, 5.0
* Django: 3.2, 4.2, 5.0
* Python: 3.8, 3.9, 3.10
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Intended Audience :: Developers',
Expand Down
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ python =
[gh-actions:env]
DJANGO =
3.2: dj32
4.1: dj41
4.2: dj42
5.0: dj50
main: djmain
Expand All @@ -30,7 +29,6 @@ deps =
mysql: mysqlclient
postgresql: psycopg2-binary
dj32: django>=3.2,<3.3
dj41: django>=4.1,<4.2
dj42: django>=4.2,<4.3
dj50: django>=5.0,<5.1
djmain: https://github.com/django/django/archive/main.tar.gz
Expand Down
Loading