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

Remove unsupported versions of Django and Python #668

Merged
merged 2 commits into from
Sep 7, 2023
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
19 changes: 2 additions & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,20 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.0', '4.1', 'main']
python-version: ['3.8', '3.9', '3.10', '3.11']
django-version: ['3.2', '4.1', 'main']
postgres-version: ['11', '12']
mariadb-version: ['10.3', '10.4']
exclude:
# Django >=4.0 drops support for python 3.7 (https://docs.djangoproject.com/en/4.1/faq/install/)
- python-version: '3.7'
django-version: '4.0'
- python-version: '3.7'
django-version: '4.1'
- python-version: '3.7'
django-version: 'main'

# 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.11'
django-version: '4.0'

# only test Django dev with PostgreSQL 12 and MariaDB 10.4
- django-version: '3.2'
postgres-version: '12'
- django-version: '3.2'
mariadb-version: '10.4'

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

- django-version: '4.1'
postgres-version: '12'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ repos:
rev: 'v3.10.1'
hooks:
- id: pyupgrade
args: ['--py37-plus', '--keep-mock']
args: ['--keep-mock']
- repo: https://github.com/adamchainz/django-upgrade
rev: '1.14.0'
hooks:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Silk is a live profiling and inspection tool for the Django framework. Silk inte

Silk has been tested with:

* Django: 3.2, 4.0, 4.1
* Python: 3.7, 3.8, 3.9, 3.10, 3.11
* Django: 3.2, 4.1
* Python: 3.8, 3.9, 3.10, 3.11

## Installation

Expand Down
4 changes: 2 additions & 2 deletions 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.0, 4.1
* Python: 3.7, 3.8, 3.9, 3.10
* Django: 3.2, 4.1
* Python: 3.8, 3.9, 3.10
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
Expand All @@ -41,6 +39,6 @@
'autopep8',
'gprof2dot>=2017.09.19',
],
python_requires='>=3.7',
python_requires='>=3.8',
setup_requires=['setuptools_scm'],
)
5 changes: 1 addition & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[gh-actions]
python =
3.7: py37
3.8: py38
3.9: py39
3.10: py310
Expand All @@ -9,13 +8,12 @@ python =
[gh-actions:env]
DJANGO =
3.2: dj32
4.0: dj40
4.1: dj41
main: djmain

[tox]
envlist =
py{37,38,39,310}-dj32-{sqlite3,mysql,postgresql}
py{38,39,310}-dj32-{sqlite3,mysql,postgresql}
py{38,39,310}-dj{40,41,main}-{sqlite3,mysql,postgresql}
py311-dj{41,main}-{sqlite3,mysql,postgresql}

Expand All @@ -29,7 +27,6 @@ deps =
mysql: mysqlclient
postgresql: psycopg2-binary
dj32: django>=3.2,<3.3
dj40: django>=4.0,<4.1
dj41: django>=4.1,<4.2
djmain: https://github.com/django/django/archive/main.tar.gz
setenv =
Expand Down
Loading