Merge pull request #152 from JBKahn/django3

mwarkentin · web-flow · commit 3b2dd575d7a7 · 2019-12-18T15:48:26.000-05:00
only support django&gt;=2.2
diff --git a/.travis.yml b/.travis.yml
@@ -2,26 +2,20 @@ dist: xenial
 language: python
 
 python:
+  - "3.8"
   - "3.7"
   - "3.6"
   - "3.5"
-  - "2.7"
 
 env:
   matrix:
     - DJANGO_VERSION=2.2
-    - DJANGO_VERSION=2.1
-    - DJANGO_VERSION=2.0
-    - DJANGO_VERSION=1.11
+    - DJANGO_VERSION=3.0
 
 matrix:
   exclude:
-    - python: "2.7"
-      env: DJANGO_VERSION=2.0
-    - python: "2.7"
-      env: DJANGO_VERSION=2.1
-    - python: "2.7"
-      env: DJANGO_VERSION=2.2
+    - python: "3.5"
+      env: DJANGO_VERSION=3.0
 
 install:
   - pip install tox coveralls
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -4,6 +4,12 @@
 History
 =======
 
+1.0.0 (2019-12-18)
+-------------------
+
+* Drop support for python2 and Django<2.2 (the only officially supported versions of Django that aren't on 2.7) (@JBKahn)
+* Drop usage of django-jsonview in favor of the builtin django JsonResponse (@JBKahn)
+
 0.18.0 (2019-08-19)
 -------------------
 
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -1,7 +1,4 @@
-django-jsonview==0.5.0
-
 coverage>=4.0
-mock>=1.0.1
 nose>=1.3.0
 django-nose>=1.2
 flake8>=2.1.0
diff --git a/setup.py b/setup.py
@@ -36,8 +36,7 @@
     ],
     include_package_data=True,
     install_requires=[
-        'django',
-        'django-jsonview>=0.5.0',
+        'django>=2.0',
     ],
     license="BSD",
     zip_safe=False,
@@ -48,11 +47,10 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
 )
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
@@ -12,14 +12,10 @@
 import logging
 import unittest
 
-try:
-    from django.urls import reverse
-except ImportError:
-    # Deprecated in Django 1.10
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test.client import Client
 
-import mock
+from unittest import mock
 
 from watchman import settings as watchman_settings
 from watchman.decorators import check
diff --git a/tests/test_management.py b/tests/test_management.py
@@ -9,10 +9,10 @@
 
 from __future__ import unicode_literals
 
+from io import StringIO
 import unittest
 
 from django.core.management import call_command
-from django.utils.six import StringIO
 
 
 class TestWatchman(unittest.TestCase):
diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -11,8 +11,7 @@
 
 import unittest
 
-import django
-from mock import patch
+from unittest.mock import patch
 
 from watchman.utils import get_cache, get_checks
 
@@ -27,24 +26,11 @@ def assert_lists_equal(self, list1, list2):
             # Python 2
             self.assertItemsEqual(list1, list2)
 
-    @unittest.skipIf(
-        django.VERSION < (1, 7),
-        'caches interface is not added until Django 1.7',
-    )
     @patch('watchman.utils.django_cache.caches', spec_set=dict)
     def test_get_cache_django_17_or_greater(self, get_cache_mock):
         get_cache('foo')
         get_cache_mock.__getitem__.called_once_with('foo')
 
-    @unittest.skipIf(
-        django.VERSION >= (1, 7),
-        'get_cache has been deprecated as of Django 1.7'
-    )
-    @patch('django.core.cache.get_cache')
-    def test_get_cache_less_than_django_17(self, get_cache_mock):
-        get_cache('foo')
-        get_cache_mock.assert_called_once_with('foo')
-
     def test_get_checks_returns_all_available_checks_by_default(self):
         checks = [check.__name__ for check in get_checks()]
         expected_checks = ['caches', 'databases', 'storage']
diff --git a/tests/test_views.py b/tests/test_views.py
@@ -17,11 +17,7 @@
 from django.db.utils import DEFAULT_DB_ALIAS
 from django.test.testcases import TransactionTestCase
 
-
-try:
-    from importlib import reload
-except ImportError:  # Python < 3
-    pass
+from importlib import reload
 import sys
 import unittest
 
@@ -33,12 +29,10 @@
 from django.test.client import RequestFactory, Client
 from django.test.utils import override_settings
 
-from mock import patch
+from unittest.mock import patch
 
 from watchman import checks, views
 
-PYTHON_VERSION = sys.version_info[0]
-
 
 class AuthenticatedUser(AnonymousUser):
     @property
@@ -55,12 +49,11 @@ def __bool__(self):
         return CallableTrue()
 
 
-if django.VERSION >= (1, 7):
-    # Initialize Django
-    django.setup()
+# Initialize Django
+django.setup()
 
-    # Silence MIDDLEWARE_CLASSES warning as this is not an actual Django project
-    settings.SILENCED_SYSTEM_CHECKS = ['1_7.W001']
+# Silence MIDDLEWARE_CLASSES warning as this is not an actual Django project
+settings.SILENCED_SYSTEM_CHECKS = ['1_7.W001']
 
 
 def reload_settings():
@@ -85,23 +78,16 @@ def test_response_contains_expected_checks(self):
         request = RequestFactory().get('/')
         response = views.status(request)
 
-        if PYTHON_VERSION == 2:
-            content = json.loads(response.content)
-            self.assertItemsEqual(expected_checks, content.keys())
-        else:
-            content = json.loads(response.content.decode('utf-8'))
-            self.assertCountEqual(expected_checks, content.keys())
+        content = json.loads(response.content.decode('utf-8'))
+        self.assertCountEqual(expected_checks, content.keys())
 
     def test_check_database_handles_exception(self):
         response = checks._check_database('foo')
         self.assertFalse(response['foo']['ok'])
         self.assertEqual(response['foo']['error'], "The connection foo doesn't exist")
 
     def test_check_cache_handles_exception(self):
-        if django.VERSION < (1, 7):
-            expected_error = "Could not find backend 'foo': Could not find backend 'foo': foo doesn't look like a module path"
-        else:
-            expected_error = "Could not find config for 'foo' in settings.CACHES"
+        expected_error = "Could not find config for 'foo' in settings.CACHES"
 
         response = checks._check_cache('foo')
         self.assertFalse(response['foo']['ok'])
@@ -114,12 +100,8 @@ def test_response_skipped_checks(self):
         })
         response = views.status(request)
 
-        if PYTHON_VERSION == 2:
-            content = json.loads(response.content)
-            self.assertItemsEqual(expected_checks, content.keys())
-        else:
-            content = json.loads(response.content.decode('utf-8'))
-            self.assertCountEqual(expected_checks, content.keys())
+        content = json.loads(response.content.decode('utf-8'))
+        self.assertCountEqual(expected_checks, content.keys())
 
     def test_response_is_404_for_checked_and_skipped_check(self):
         # This is a bit of a weird one, basically if you explicitly include and
@@ -141,12 +123,8 @@ def test_response_only_single_check(self, patched_check_databases):
         response = views.status(request)
         self.assertEqual(response.status_code, 200)
 
-        if PYTHON_VERSION == 2:
-            content = json.loads(response.content)
-            self.assertItemsEqual({'databases': []}, content)
-        else:
-            content = json.loads(response.content.decode('utf-8'))
-            self.assertCountEqual({'databases': []}, content)
+        content = json.loads(response.content.decode('utf-8'))
+        self.assertCountEqual({'databases': []}, content)
 
     def test_response_404_when_none_specified(self):
         request = RequestFactory().get('/', data={
@@ -155,12 +133,8 @@ def test_response_404_when_none_specified(self):
         response = views.status(request)
         self.assertEqual(response.status_code, 404)
 
-        if PYTHON_VERSION == 2:
-            content = json.loads(response.content)
-            self.assertItemsEqual({'message': 'No checks found', 'error': 404}, content)
-        else:
-            content = json.loads(response.content.decode('utf-8'))
-            self.assertCountEqual({'message': 'No checks found', 'error': 404}, content)
+        content = json.loads(response.content.decode('utf-8'))
+        self.assertCountEqual({'message': 'No checks found', 'error': 404}, content)
 
     @override_settings(WATCHMAN_TOKEN='ABCDE')
     @override_settings(WATCHMAN_AUTH_DECORATOR='watchman.decorators.token_required')
diff --git a/tox.ini b/tox.ini
@@ -1,19 +1,17 @@
 [tox]
 envlist =
     covclean,
-    py27-dj111,
-    py{35,36,37}-dj{111,20,21,22},
+    py{36,37,38}-dj{22,30},
+    py{35}-dj22,
     coverage
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/watchman
 commands = coverage run --parallel --source watchman runtests.py {posargs}
 deps =
-    dj111: Django>=1.11,<2.0
-    dj20: Django>=2.0,<2.1
-    dj21: Django>=2.1,<2.2
     dj22: Django>=2.2,<2.3
+    dj30: Django>=3.0,<3.1
     -r{toxinidir}/requirements-test.txt
 
 [testenv:covclean]
diff --git a/watchman/__init__.py b/watchman/__init__.py
@@ -1 +1 @@
-__version__ = '0.18.0'
+__version__ = '1.0.0'
diff --git a/watchman/utils.py b/watchman/utils.py
@@ -1,49 +1,13 @@
 # -*- coding: utf-8 -*-
 
-import django
 from django.core import cache as django_cache
+from django.utils.module_loading import import_string
 
 from watchman.settings import WATCHMAN_CHECKS
 
-try:  # try for Django 1.7+ first.
-    from django.utils.module_loading import import_string
-except ImportError:  # < Django 1.7
-    try:
-        from django.utils.module_loading import import_by_path as import_string
-    except ImportError:  # < Django 1.5.3 (including 1.4 LTS)
-        import sys
-        from django.utils import six
-        from django.utils.importlib import import_module
-        from django.core.exceptions import ImproperlyConfigured
-
-        def import_string(dotted_path, error_prefix=''):
-            try:
-                module_path, class_name = dotted_path.rsplit('.', 1)
-            except ValueError:
-                raise ImproperlyConfigured("%s%s doesn't look like a module path" % (
-                    error_prefix, dotted_path))
-            try:
-                module = import_module(module_path)
-            except ImportError as e:
-                msg = '%sError importing module %s: "%s"' % (
-                    error_prefix, module_path, e)
-                six.reraise(ImproperlyConfigured, ImproperlyConfigured(msg),
-                            sys.exc_info()[2])
-            try:
-                attr = getattr(module, class_name)
-            except AttributeError:
-                raise ImproperlyConfigured('%sModule "%s" does not define a "%s" attribute/class' % (
-                    error_prefix, module_path, class_name))
-            return attr
-
 
 def get_cache(cache_name):
-    # As of Django 1.7, django.core.cache.caches replaces
-    # django.core.cache.get_cache
-    if django.VERSION < (1, 7):
-        return django_cache.get_cache(cache_name)
-    else:
-        return django_cache.caches[cache_name]
+    return django_cache.caches[cache_name]
 
 
 def get_checks(check_list=None, skip_list=None):
diff --git a/watchman/views.py b/watchman/views.py
@@ -4,10 +4,9 @@
 import warnings
 
 from django.db.transaction import non_atomic_requests
-from django.http import Http404, HttpResponse
+from django.http import JsonResponse, HttpResponse
 from django.shortcuts import render
 from django.utils.translation import ugettext as _
-from jsonview.decorators import json_view
 from watchman import __version__, settings
 from watchman.decorators import auth
 from watchman.utils import get_checks
@@ -82,21 +81,26 @@ def run_checks(request):
 
 
 @auth
-@json_view
 @non_atomic_requests
 def status(request):
     checks, ok = run_checks(request)
 
     if not checks:
-        raise Http404(_('No checks found'))
+        response = JsonResponse(
+            {
+                'error': 404,
+                'message': _('No checks found'),
+            },
+            status=404
+        )
+    else:
+        http_code = 200 if ok else settings.WATCHMAN_ERROR_CODE
+        response = JsonResponse(checks, status=http_code)
 
-    http_code = 200 if ok else settings.WATCHMAN_ERROR_CODE
-
-    response_headers = {}
     if settings.EXPOSE_WATCHMAN_VERSION:
-        response_headers[WATCHMAN_VERSION_HEADER] = __version__
+        response[WATCHMAN_VERSION_HEADER] = __version__
 
-    return checks, http_code, response_headers
+    return response
 
 
 @non_atomic_requests

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '0.18.0'`
	`1`	`+__version__ = '1.0.0'`