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

Drop support for end-of-life Django 2.2 #968

Merged
merged 1 commit into from
Aug 17, 2022
Merged

Drop support for end-of-life Django 2.2 #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ test:
-Wdefault:"Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working":DeprecationWarning:: \
-Wdefault:"set_output_charset() is deprecated":DeprecationWarning:: \
-Wdefault:"parameter codeset is deprecated":DeprecationWarning:: \
-Wdefault:"distutils Version classes are deprecated. Use packaging.version instead":DeprecationWarning:: \
-m unittest
# TODO: Remove "distutils Version classes are deprecated" when django 2.2 is dropped

# DOC: Test the examples
example-test:
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ChangeLog

*Removed:*

- Drop support for Django 2.2
- Drop support for Django 3.0
- Drop support for Django 3.1
- Drop support for Python 3.6
Expand Down
8 changes: 2 additions & 6 deletions examples/django_demo/django_demo/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,9 @@
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
try:
# TODO: After dropping Django 2.2, switch to `path`
from django.urls import re_path as url
except ImportError:
from django.conf.urls import url
from django.contrib import admin
from django.urls import path

urlpatterns = [
url(r'^admin/', admin.site.urls),
path('admin/', admin.site.urls),
]
1 change: 0 additions & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ license = MIT
classifiers =
Development Status :: 5 - Production/Stable
Framework :: Django
Framework :: Django :: 2.2
Framework :: Django :: 3.2
Framework :: Django :: 4.0
Intended Audience :: Developers
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ envlist =
examples
linkcheck
py{37,38,39,310,py37,py38,py39}-sqlite
py{37,38,39,py37,py38,py39}-django22-mongo-alchemy-{sqlite,postgres}
py{37,38,39,310,py37,py38,py39}-django32-mongo-alchemy-{sqlite,postgres}
py{38,39,310,py38,py39}-django40-mongo-alchemy-{sqlite,postgres}
py310-djangomain-mongo-alchemy-{sqlite,postgres}
Expand Down Expand Up @@ -35,8 +34,7 @@ deps =
alchemy: SQLAlchemy
alchemy: sqlalchemy_utils
mongo: mongoengine
django{22,32,40,main}: Pillow
django22: Django>=2.2,<2.3
django{32,40,main}: Pillow
django32: Django>=3.2,<3.3
django40: Django>=4.0,<4.1
djangomain: https://github.com/django/django/archive/main.tar.gz
Expand Down