Merge d5d1de7 into 089e21a

.travis.yml

@@ -1,62 +1,29 @@
-sudo: false
+dist: xenial
 language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "pypy"
-  - "pypy3"
-env:
-  matrix:
-    - DJANGO="Django>=1.4,<1.5"
-    - DJANGO="Django>=1.5,<1.6"
-    - DJANGO="Django>=1.6,<1.7"
-    - DJANGO="Django>=1.7,<1.8"
-    - DJANGO="Django>=1.8,<1.9"
-    - DJANGO="Django>=1.9,<1.10"
-    - DJANGO="--pre django"
 install:
   - pip install $DJANGO
   - pip install coveralls
-  - pip install -r dev-requirements.txt
+  - pip install --upgrade -r dev-requirements.txt
 script:
-  - inv test
+  - py.test --cov sudo --cov-report term-missing
 after_success:
   - coveralls
 matrix:
-  fast_finish: true
-  exclude:
-    - python: "2.6"
-      env: DJANGO="Django>=1.7,<1.8"
-    - python: "2.6"
-      env: DJANGO="Django>=1.8,<1.9"
-    - python: "2.6"
+  include:
+    - name: 'Linter (Python 2.7)'
+      script: flake8 sudo tests
+    - python: "3.7"
+      name: 'Linter (Python 3.7)'
+      script: flake8 sudo tests
+    - python: "2.7"
+      name: "Python 2.7, Django 1.9"
       env: DJANGO="Django>=1.9,<1.10"
-    - python: "2.6"
-      env: DJANGO="--pre django"
-    - python: "3.3"
-      env: DJANGO="Django>=1.4,<1.5"
-    - python: "3.3"
-      env: DJANGO="Django>=1.9,<1.10"
-    - python: "3.3"
-      env: DJANGO="--pre django"
-    - python: "3.4"
-      env: DJANGO="Django>=1.4,<1.5"
-    - python: "3.5"
-      env: DJANGO="Django>=1.4,<1.5"
-    - python: "3.5"
-      env: DJANGO="Django>=1.5,<1.6"
+    - python: "2.7"
+      name: "Python 2.7, Django 1.10"
+      env: DJANGO="Django>=1.10,<1.11"
     - python: "3.5"
-      env: DJANGO="Django>=1.6,<1.7"
-    - python: "3.5"
-      env: DJANGO="Django>=1.7,<1.8"
-    - python: "pypy3"
-      env: DJANGO="Django>=1.4,<1.5"
-    - python: "pypy3"
+      name: "Python 3.5, Django 1.9"
       env: DJANGO="Django>=1.9,<1.10"
-    - python: "pypy3"
-      env: DJANGO="--pre django"
-  allow_failures:
-    - env: DJANGO="--pre django"
+    - python: "3.5"
+      name: "Python 3.5, Django 1.10"
+      env: DJANGO="Django>=1.10,<1.11"

dev-requirements.txt

@@ -1,9 +1,8 @@
 -e .
-flake8<3.0
-invoke>=0.11.1,<0.12
-pytest
-pytest-cov
-pytest-django
+sentry-flake8>=0.2.0,<0.3.0
+pytest==4.6.5
+pytest-cov==2.5.1
+pytest-django==3.5.1
 sphinx
 sphinx_rtd_theme
 tox

setup.cfg

@@ -1,4 +1,4 @@
-[pytest]
+[tool:pytest]
 python_files = tests/*.py
 
 [flake8]

sudo/__init__.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 try:
     VERSION = __import__('pkg_resources') \
         .get_distribution('sudo').version

sudo/decorators.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 from functools import wraps
 
 from sudo.views import redirect_to_sudo

sudo/forms.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 from django import forms
 from django.contrib import auth
 from django.utils.translation import ugettext_lazy as _

sudo/middleware.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 from sudo.settings import (
     COOKIE_DOMAIN, COOKIE_HTTPONLY, COOKIE_NAME,
     COOKIE_PATH, COOKIE_SECURE, COOKIE_SALT,

sudo/mixins.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from sudo.decorators import sudo_required
 
 

sudo/models.py

@@ -5,5 +5,7 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 # Register signals automatically by installing the app
 from sudo.signals import *  # noqa

sudo/signals.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 from django.contrib.auth.signals import user_logged_in, user_logged_out
 from django.dispatch import receiver
 

sudo/utils.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 import unicodedata
 
 from django.core.signing import BadSignature

sudo/views.py

@@ -5,6 +5,8 @@
 :copyright: (c) 2014 by Matt Robenolt.
 :license: BSD, see LICENSE for more details.
 """
+from __future__ import absolute_import
+
 try:
     from urllib.parse import urlparse, urlunparse
 except ImportError:  # pragma: no cover

tests/__init__.py

@@ -0,0 +1 @@
+from __future__ import absolute_import

tests/base.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 try:
     from django.utils import unittest
 except ImportError:

tests/decorators.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .base import BaseTestCase
 
 from django.http import HttpResponse

tests/forms.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .base import BaseTestCase
 from .models import EmailUser
 

tests/middleware.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .base import BaseTestCase
 
 from django.http import HttpResponse

tests/mixins.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .base import BaseTestCase
 from django.http import HttpResponse
 from django.views import generic

tests/models.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import django
 from django.db import models
 try:

tests/signals.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .base import BaseTestCase
 from sudo.signals import grant, revoke
 from sudo.utils import has_sudo_privileges, grant_sudo_privileges

tests/urls.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 try:
     from django.conf.urls import url, patterns
 except ImportError:

tests/utils.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from sudo.settings import COOKIE_NAME, COOKIE_AGE
 from sudo.utils import (
     grant_sudo_privileges,

tests/views.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .base import BaseTestCase
 
 from django.template.response import TemplateResponse