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.

Sign up for GitHub

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

Jump to bottom

Update python django #952

Merged
merged 3 commits into from
Feb 3, 2022
Merged

Update python django #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
745f641
Remove remaining parts of Python3.6
hramezani Feb 2, 2022
7dbb590
Dropped support for Django 3.1
hramezani Feb 2, 2022
e6bd50e
Add Django4.0 to supported Django and Python table in docs.
hramezani Feb 2, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
django-version: ['2.2', '3.1', '3.2', '4.0', 'main']
django-version: ['2.2', '3.2', '4.0', 'main']

exclude:
- python-version: '3.7'
Expand Down
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Full list of changes:
- Added support for Django 4.0 (gh-898)
- Dropped support for Python 3.6, which reached end-of-life on 2021-12-23 (gh-946).
- Fix bug with ``history.diff_against`` with non-editable fields (gh-923)
- Dropped support for Django 3.1 (gh-952)

3.0.0 (2021-04-16)
------------------
Expand Down
5 changes: 2 additions & 3 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ This app supports the following combinations of Django and Python:
========== ========================
Django Python
========== ========================
2.2 3.6, 3.7, 3.8, 3.9
3.1 3.6, 3.7, 3.8, 3.9
3.2 3.6, 3.7, 3.8, 3.9, 3.10
2.2 3.7, 3.8, 3.9
3.2 3.7, 3.8, 3.9, 3.10
4.0 3.8, 3.9, 3.10
========== ========================

Expand Down
6 changes: 3 additions & 3 deletions docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ This app supports the following combinations of Django and Python:
========== =======================
Django Python
========== =======================
2.2 3.6, 3.7, 3.8, 3.9
3.1 3.6, 3.7, 3.8, 3.9
3.2 3.6, 3.7, 3.8, 3.9
2.2 3.7, 3.8, 3.9
3.2 3.7, 3.8, 3.9
4.0 3.8, 3.9, 3.10
========== =======================

Contribute
Expand Down
1 change: 0 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"Intended Audience :: Developers",
"Framework :: Django",
"Framework :: Django :: 2.2",
"Framework :: Django :: 3.1",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Programming Language :: Python",
Expand Down
7 changes: 2 additions & 5 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[tox]
envlist =
py{36,37,38,39}-dj{22,31}-{sqlite3,postgres,mysql,mariadb},
py{36,37,38,39,310}-dj32-{sqlite3,postgres,mysql,mariadb},
py{37,38,39}-dj22-{sqlite3,postgres,mysql,mariadb},
py{37,38,39,310}-dj32-{sqlite3,postgres,mysql,mariadb},
py{38,39,310}-dj{40,main}-{sqlite3,postgres,mysql,mariadb},
docs,
lint

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38, docs, lint
3.9: py39
Expand All @@ -17,7 +16,6 @@ python =
[gh-actions:env]
DJANGO =
2.2: dj22
3.1: dj31
3.2: dj32
4.0: dj40
main: djmain
Expand All @@ -32,7 +30,6 @@ exclude = __init__.py,simple_history/registry_tests/migration_test_app/migration
deps =
-rrequirements/test.txt
dj22: Django>=2.2,<2.3
dj31: Django>=3.1,<3.2
dj32: Django>=3.2,<3.3
dj40: Django>=4.0,<4.1
djmain: https://github.com/django/django/tarball/main
Expand Down