Merge pull request #105 from atombrella/django_40

Add support for Django 4.0. Add missing classifier for Python 3.7.

Author: benjaoming

.circleci/config.yml

@@ -59,6 +59,18 @@ workflows:
       - tox:
           tox_env: "py39-django32"
           python_version: "3.9"
+      - tox:
+          tox_env: "py310-django32"
+          python_version: "3.10"
+      - tox:
+          tox_env: "py38-django40"
+          python_version: "3.8"
+      - tox:
+          tox_env: "py39-django40"
+          python_version: "3.9"
+      - tox:
+          tox_env: "py310-django40"
+          python_version: "3.10"
       - tox:
           tox_env: "lint"
           python_version: "3.8"

.gitignore

@@ -37,6 +37,7 @@ pip-log.txt
 .coverage
 .tox
 nosetests.xml
+coverage.xml
 
 # Translations
 *.mo

django_nyt/decorators.py

@@ -28,7 +28,7 @@ def login_required_ajax(f):
 
     @wraps(f)
     def wrapper(request, *args, **kwargs):
-        if request.is_ajax():
+        if request.headers.get('x-requested-with') == 'XMLHttpRequest':
             if not request.user or not request.user.is_authenticated:
                 return json_view(lambda *a,
                                  **kw: {'error': 'not logged in'})(request,

django_nyt/tests/test_management.py

@@ -41,7 +41,8 @@ def test_notifymail(self):
             # It's normal for this command to exit
             pass
 
-        pid = open(pid_file.name, 'r').read()
+        with open(pid_file.name, 'r') as fp:
+            pid = fp.read()
         os.unlink(pid_file.name)
 
         # Give it a second to start

django_nyt/urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import include
-from django.conf.urls import url
+from django.urls import include, re_path as url
 
 from . import views
 

setup.py

@@ -17,7 +17,7 @@
     keywords=["django", "notification" "alerts"],
     packages=find_packages(),
     zip_safe=False,
-    install_requires=["django>=2.2,<3.3"],
+    install_requires=["django>=2.2,<4.1"],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
@@ -32,8 +32,10 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3 :: Only',
     ],
     include_package_data=True,

test-project/testapp/urls.py

@@ -1,7 +1,4 @@
-try:
-    from django.urls import include, re_path as url
-except ImportError:
-    from django.conf.urls import include, url
+from django.urls import include, re_path as url
 
 from . import views
 

test-project/testproject/settings/__init__.py

@@ -142,7 +142,7 @@
 # django-nyt options
 ##########################################
 
-_enable_channels = True
+_enable_channels = False
 if _enable_channels:
     INSTALLED_APPS.append('channels')
     CHANNEL_LAYERS = {

test-project/testproject/urls.py

@@ -2,11 +2,7 @@
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-try:
-    from django.urls import include, re_path as url
-except ImportError:
-    from django.conf.urls import include, url
+from django.urls import include, re_path as url
 
 
 admin.autodiscover()

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-# Ensure you add to .travis.yml if you add here
-envlist = {py35,py36,py37,py38,py39,pypy}-django{22,30,31,32}
+# Ensure you add to .circleci/config.yml if you add here
+envlist = {py35,py36,py37,py38,py39,pypy}-django{22,30,31,32},{py36,py37,py38,py39,py310}-django{32},{py38,py39,py310}-django{40},
 
 [testenv]
 passenv = CODECOV_TOKEN
@@ -21,13 +21,15 @@ deps =
   django30: Django>=3.0,<3.1
   django31: Django>=3.1,<3.2
   django32: Django>=3.2,<3.3
+  django40: Django>=4.0,<4.1
 
 basepython =
   py35: python3.5
   py36: python3.6
   py37: python3.7
   py38: python3.8
   py39: python3.9
+  py310: python3.10
   pypy: python
 
 [testenv:lint]