Dropped support for Django 1.11, 2.0, and 2.1

Author: claudep

.travis.yml

@@ -2,24 +2,8 @@ dist: xenial
 language: python
 matrix:
   include:
-    - python: 3.4
-      env: TOXENV=py34-django111
-    - python: 3.4
-      env: TOXENV=py34-django20
-    - python: 3.5
-      env: TOXENV=py35-django-111
-    - python: 3.5
-      env: TOXENV=py35-django-20
-    - python: 3.5
-      env: TOXENV=py35-django-21
     - python: 3.5
       env: TOXENV=py35-django-22
-    - python: 3.6
-      env: TOXENV=py36-django-111
-    - python: 3.6
-      env: TOXENV=py36-django-20
-    - python: 3.6
-      env: TOXENV=py36-django-21
     - python: 3.6
       env: TOXENV=py36-django-22
     - python: 3.6
@@ -28,12 +12,6 @@ matrix:
       env: TOXENV=py36-django-31
     - python: 3.6
       env: TOXENV=py36-django-master
-    - python: 3.7
-      env: TOXENV=py37-django-111
-    - python: 3.7
-      env: TOXENV=py37-django-20
-    - python: 3.7
-      env: TOXENV=py37-django-21
     - python: 3.7
       env: TOXENV=py37-django-22
     - python: 3.7

HISTORY.rst

@@ -3,6 +3,11 @@
 History
 =======
 
+Unreleased
+----------
+
+* Dropped support for Django 1.11, 2.0, and 2.1.
+
 2.0.0 (2020-12-20)
 ------------------
 

django_comments/urls.py

@@ -1,8 +1,5 @@
-try:
-    from django.urls import re_path as url
-except ImportError:
-    from django.conf.urls import url
 from django.contrib.contenttypes.views import shortcut
+from django.urls import path, re_path
 
 from .views.comments import post_comment, comment_done
 from .views.moderation import (
@@ -11,14 +8,14 @@
 
 
 urlpatterns = [
-    url(r'^post/$', post_comment, name='comments-post-comment'),
-    url(r'^posted/$', comment_done, name='comments-comment-done'),
-    url(r'^flag/(\d+)/$', flag, name='comments-flag'),
-    url(r'^flagged/$', flag_done, name='comments-flag-done'),
-    url(r'^delete/(\d+)/$', delete, name='comments-delete'),
-    url(r'^deleted/$', delete_done, name='comments-delete-done'),
-    url(r'^approve/(\d+)/$', approve, name='comments-approve'),
-    url(r'^approved/$', approve_done, name='comments-approve-done'),
+    path('post/', post_comment, name='comments-post-comment'),
+    path('posted/', comment_done, name='comments-comment-done'),
+    path('flag/<int:comment_id>/', flag, name='comments-flag'),
+    path('flagged/', flag_done, name='comments-flag-done'),
+    path('delete/<int:comment_id>/', delete, name='comments-delete'),
+    path('deleted/', delete_done, name='comments-delete-done'),
+    path('approve/<int:comment_id>/', approve, name='comments-approve'),
+    path('approved/', approve_done, name='comments-approve-done'),
 
-    url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'),
+    re_path(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'),
 ]

docs/example.txt

@@ -140,12 +140,12 @@ enable it in your project's ``urls.py``:
 
 .. code-block:: python
 
-  from django.conf.urls import url
+  from django.urls import path
   from django_comments.feeds import LatestCommentFeed
 
   urlpatterns = [
   # ...
-      url(r'^feeds/latest/$', LatestCommentFeed()),
+      path('feeds/latest/', LatestCommentFeed()),
   # ...
   ]
 

setup.py

@@ -23,9 +23,6 @@
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
-        'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
         'Framework :: Django :: 3.1',
@@ -42,5 +39,5 @@
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     test_suite='tests.runtests.main',
-    install_requires=['Django>=1.11']
+    install_requires=['Django>=2.2']
 )

tests/testapp/urls.py

@@ -1,8 +1,5 @@
-try:
-    from django.urls import re_path as url
-except ImportError:
-    from django.conf.urls import url
 from django.contrib.contenttypes.views import shortcut
+from django.urls import path, re_path
 
 from django_comments.feeds import LatestCommentFeed
 
@@ -14,12 +11,12 @@
 }
 
 urlpatterns = [
-    url(r'^post/$', views.custom_submit_comment),
-    url(r'^flag/(\d+)/$', views.custom_flag_comment),
-    url(r'^delete/(\d+)/$', views.custom_delete_comment),
-    url(r'^approve/(\d+)/$', views.custom_approve_comment),
+    path('post/', views.custom_submit_comment),
+    path('flag/<int:comment_id>/', views.custom_flag_comment),
+    path('delete/<int:comment_id>/', views.custom_delete_comment),
+    path('approve/<int:comment_id>/', views.custom_approve_comment),
 
-    url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'),
+    re_path(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'),
 
-    url(r'^rss/comments/$', LatestCommentFeed()),
+    path('rss/comments/', LatestCommentFeed()),
 ]

tests/testapp/urls_admin.py

@@ -1,8 +1,6 @@
-try:
-    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
+
 from django_comments.admin import CommentsAdmin
 from django_comments.models import Comment
 
@@ -17,6 +15,6 @@
 admin_site2.register(Comment, CommentsAdmin)
 
 urlpatterns = [
-    url(r'^admin/', admin_site.urls),
-    url(r'^admin2/', admin_site2.urls),
+    path('admin/', admin_site.urls),
+    path('admin2/', admin_site2.urls),
 ]

tests/testapp/urls_default.py

@@ -1,15 +1,11 @@
-try:
-    from django.urls import re_path as url
-except ImportError:
-    from django.conf.urls import url
-from django.conf.urls import include
+from django.urls import include, path
 from django.contrib.auth.views import LoginView, LogoutView
 
 
 urlpatterns = [
-    url(r'^', include('django_comments.urls')),
+    path('', include('django_comments.urls')),
 
     # Provide the auth system login and logout views
-    url(r'^accounts/login/$', LoginView.as_view(template_name='login.html')),
-    url(r'^accounts/logout/$', LogoutView.as_view()),
+    path('accounts/login/', LoginView.as_view(template_name='login.html')),
+    path('accounts/logout/', LogoutView.as_view()),
 ]

tox.ini

@@ -1,16 +1,12 @@
 [tox]
 envlist =
-    py{34,35,36,37}-django111
-    py3{4,5,6,7}-django20
-    py3{5,6,7}-django21
     py3{5,6,7}-django22
     py3{6,7,8}-django30
     py3{6,7,8}-django31
     py3{6,7,8}-master
 
 [testenv]
 basepython =
-    py34: python3.4
     py35: python3.5
     py36: python3.6
     py37: python3.7
@@ -19,9 +15,6 @@ commands = {envpython} setup.py test
 setenv=
   PYTHONWARNINGS=default
 deps=
-    django-111: Django>=1.11a1,<2.0
-    django-20: Django>=2.0a1,<2.1
-    django-21: Django>=2.1a1,<2.2
     django-22: Django>=2.2a1,<3.0
     django-30: Django>=3.0a1,<3.1
     django-31: Django>=3.1a1,<3.2