Added changes to allow working with Django 4.0 and 4.1.

Author: BITSOLVER

.python-version

@@ -4,5 +4,8 @@
 3.5.4
 3.6.3
 3.7.0
+3.8.13
+3.9.12
+3.10.6
 pypy2.7-5.9.0
 pypy3-2.4.0

.travis.yml

@@ -5,6 +5,10 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
+  - "3.8"
+  - "3.9"
+  - "3.10"
   - "pypy"
   - "pypy3"
 matrix:

AUTHORS

@@ -26,3 +26,4 @@ Contributors
 * [kavdev](https://github.com/kavdev)
 * [graingert](https://github.com/graingert)
 * [LuukOost](https://github.com/LuukOost)
+* [BITSOLVER](https://github/BITSOLVER)

CHANGELOG.rst

@@ -1,6 +1,11 @@
 0.10.1a1 (unreleased)
 ---------------------
 
+- Update for Django 4.0 and 4.1, Python 3.8, 3.9, 3.10
+
+0.10.1a1 (unreleased)
+---------------------
+
 - Update pypi deploy username and token
 
 

README.rst

@@ -51,19 +51,23 @@ Result:
 Requirements
 ------------
 
-+----------------+------------------------------------------+
-| Python version | Django versions                          |
-+================+==========================================+
-| 3.7            | 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8      |
-+----------------+------------------------------------------+
-| 3.6            | 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8      |
-+----------------+------------------------------------------+
-| 3.5            | 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8      |
-+----------------+------------------------------------------+
-| 3.4            | 2.0, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5 |
-+----------------+------------------------------------------+
-| 2.7            | 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5      |
-+----------------+------------------------------------------+
++----------------+-------------------------------------------------------------------+
+| Python version | Django versions                                                   |
++================+===================================================================+
+| 3.10           | 4.1, 4.0, 3.2, 3.1, 3.0, 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8      |
+| 3.9            | 4.1, 4.0, 3.2, 3.1, 3.0, 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8      |
+| 3.8            | 4.1, 4.0, 3.2, 3.1, 3.0, 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8      |
++----------------+-------------------------------------------------------------------+
+| 3.7            | 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8                               |
++----------------+-------------------------------------------------------------------+
+| 3.6            | 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8                               |
++----------------+-------------------------------------------------------------------+
+| 3.5            | 2.2, 2.1, 2.0, 1.11, 1.10, 1.9, 1.8                               |
++----------------+-------------------------------------------------------------------+
+| 3.4            | 2.0, 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5                          |
++----------------+-------------------------------------------------------------------+
+| 2.7            | 1.11, 1.10, 1.9, 1.8, 1.7, 1.6, 1.5                               |
++----------------+-------------------------------------------------------------------+
 
 
 Installation

django_js_reverse/core.py

@@ -3,7 +3,8 @@
 import json
 import re
 import sys
-from distutils.version import LooseVersion
+#from distutils.version import LooseVersion
+from packaging.version import parse as LooseVersion
 
 import django
 from django.conf import settings

django_js_reverse/management/commands/collectstatic_js_reverse.py

@@ -15,10 +15,12 @@
 except ImportError:
     from django.core.urlresolvers import get_resolver
 
+REQUIRES_SYSTEM_CHECKS = [False]
+
 
 class Command(BaseCommand):
     help = 'Creates a static urls-js file for django-js-reverse'
-    requires_system_checks = False
+    requires_system_checks = REQUIRES_SYSTEM_CHECKS
     def get_location(self):
         output_path = getattr(settings, 'JS_REVERSE_OUTPUT_PATH', JS_OUTPUT_PATH)
         if output_path:

django_js_reverse/tests/test_urlconf_urls.py

@@ -1,4 +1,7 @@
-from django.conf.urls import url
+try:
+    from django.conf.urls import url
+except ImportError:
+    from django.urls import re_path as url
 from django.views.generic import View
 
 urlpatterns = [

django_js_reverse/tests/test_urls.py

@@ -2,7 +2,10 @@
 from copy import copy
 
 from django.conf.urls import include as django_include
-from django.conf.urls import url
+try:
+    from django.conf.urls import url
+except ImportError:
+    from django.urls import re_path as url
 from django.views.generic import View
 from django_js_reverse.tests.helper import is_django_ver_gte_2
 from django_js_reverse.views import urls_js

package.json

@@ -25,5 +25,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "0.10.1-a-dev.1.0"
+  "version": "0.10.1-b-dev.1.0"
 }

tox.ini

@@ -2,7 +2,8 @@
 envlist =
     py{27}-django{111,110,19,18,17,16,15},
     py34-django{20,111,110,19,18,17,16,15},
-    py{35,36,37}-django{22,21,20,111,110,19,18},
+    py{35,36,37}-django{32,31,30,22,21,20,111,110,19,18},
+    py{38,39,310}-django{22,30,31,32,40,41}
     lint,
     prepare_npm
 
@@ -13,6 +14,7 @@ commands = coverage run -p django_js_reverse/tests/unit_tests.py
 deps=
     coverage==4.5.1
     js2py==0.70
+    packaging==21.3
     django15: Django>=1.5,<1.6
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
@@ -23,6 +25,11 @@ deps=
     django20: Django>=2.0,<2.1
     django21: Django>=2.1,<2.2
     django22: Django>=2.2,<2.23
+    django30: Django>=3.0,<3.1
+    django31: Django>=3.1,<3.2
+    django32: Django>=3.2,<3.3
+    django40: Django>=4.0,<4.1
+    django41: Django>=4.1,<4.2
 
 
 [testenv:coveralls]