Skip to content

Commit

Permalink
Revert "Drop support for Django 2.2 (EOL) (#567)"
Browse files Browse the repository at this point in the history
This reverts commit 0c8c2c9.
  • Loading branch information
albertyw committed Jun 20, 2022
1 parent 0c8c2c9 commit 1c327a5
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
django-version: ['3.2', '4.0', 'main']
django-version: ['2.2', '3.2', '4.0', 'main']

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ repos:
rev: '1.7.0'
hooks:
- id: django-upgrade
args: [--target-version, '3.2']
args: [--target-version, '2.2']
- repo: https://github.com/pre-commit/mirrors-autopep8
rev: 'v1.6.0'
hooks:
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.0
* Django: 2.2, 3.2, 4.0
* Python: 3.7, 3.8, 3.9, 3.10

## 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.0
* Django: 2.2, 3.2, 4.0
* Python: 3.7, 3.8, 3.9, 3.10
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Intended Audience :: Developers',
Expand All @@ -34,7 +35,7 @@
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
],
install_requires=[
'Django>=3.2',
'Django>=2.2',
'python-dateutil',
'requests',
'sqlparse',
Expand Down
4 changes: 4 additions & 0 deletions silk/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import django
from pkg_resources import DistributionNotFound, get_distribution

try:
__version__ = get_distribution("django-silk").version
except DistributionNotFound:
pass

if django.VERSION < (3, 2):
default_app_config = "silk.apps.SilkAppConfig"
3 changes: 3 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ python =

[gh-actions:env]
DJANGO =
2.2: dj22
3.2: dj32
4.0: dj40
main: djmain

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

Expand All @@ -25,6 +27,7 @@ deps =
-rrequirements.txt
mysql: mysqlclient
postgresql: psycopg2-binary<2.9
dj22: django>=2.2,<2.3
dj32: django>=3.2,<3.3
dj40: django>=4.0,<4.1
djmain: https://github.com/django/django/archive/main.tar.gz
Expand Down

0 comments on commit 1c327a5

Please sign in to comment.