Merge 0417cc6 into e3570ca

.travis.yml

@@ -1,49 +1,11 @@
 sudo: false
 language: python
-python: 3.6
-
-env:
-  matrix:
-   - TOXENV=py27-django111-backendBasic
-   - TOXENV=py34-django111-backendBasic
-   - TOXENV=py34-django111-backendAllauth
-   - TOXENV=py35-django111-backendBasic
-   - TOXENV=py35-django111-backendAllauth
-   - TOXENV=py36-django111-backendBasic
-   - TOXENV=py36-django111-backendAllauth
-   - TOXENV=py34-django20-backendBasic
-   - TOXENV=py34-django20-backendAllauth
-   - TOXENV=py35-django20-backendBasic
-   - TOXENV=py35-django20-backendAllauth
-   - TOXENV=py36-django20-backendBasic
-   - TOXENV=py36-django20-backendAllauth
-   - TOXENV=flake8
-
-matrix:
-  fast_finish: true
-  include:
-    - python: "3.5"
-      env: TOXENV=py35-django111-backendBasic
-    - python: "3.5"
-      env: TOXENV=py35-django111-backendAllauth
-    - python: "3.5"
-      env: TOXENV=py35-django20-backendBasic
-    - python: "3.5"
-      env: TOXENV=py35-django20-backendAllauth
-  exclude:
-    - python: "3.6"
-      env: TOXENV=py35-django111-backendBasic
-    - python: "3.6"
-      env: TOXENV=py35-django111-backendAllauth
-    - python: "3.6"
-      env: TOXENV=py35-django20-backendBasic
-    - python: "3.6"
-      env: TOXENV=py35-django20-backendAllauth
-  allow_failures:
-    - env: TOXENV=py35-django111-backendAllauth # Because the exclude above is ignored for some reason
-    - env: TOXENV=py35-django111-backendBasic # Because the exclude above is ignored for some reason
-    - env: TOXENV=py35-django20-backendAllauth # Because the exclude above is ignored for some reason
-    - env: TOXENV=py35-django20-backendBasic # Because the exclude above is ignored for some reason
+python:
+  - 2.7
+  - 3.5
+  - 3.6
+  - 3.7
+  - 3.8
 
 cache:
   directories:
@@ -52,11 +14,7 @@ cache:
 
 install:
   - pip install --upgrade pip wheel setuptools
-  - pip install tox coveralls
-
-branches:
-  - devel
-  - master
+  - pip install tox coveralls tox-travis
 
 script: tox
 

requirements.txt

@@ -1,6 +1,8 @@
-mock>=1.3.0
-coverage>=3.7.1
-freezegun>=0.3.5
-pytest>=3.0.7
-pytest-django>=3.1.2
-pytest-cov>=2.4.0
+coverage>=4.5.4
+flake8>=3.7.9
+freezegun>=0.3.12
+mock>=3.0.5
+pytest>=5.2.2
+pytest-django>=3.6.0
+pytest-cov>=2.8.1
+tox>=3.14.0

setup.py

@@ -22,9 +22,10 @@
         'Topic :: Internet',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Framework :: Django',
     ],
 )

tests/basic/tests.py

@@ -72,6 +72,7 @@ def test_email_subject_prefix_settings_with_custom_override(self):
 class TestInvitationsSendView:
     client = Client()
 
+    @pytest.mark.django_db
     def test_auth(self):
         response = self.client.post(
             reverse('invitations:send-invite'), {'email': 'valid@example.com'},

tox.ini

@@ -1,9 +1,10 @@
 [tox]
 envlist =
   py27-django111-backend{Basic,Allauth}
-  py34-django{111,20}-backend{Basic,Allauth}
-  py35-django{111,20}-backend{Basic,Allauth}
-  py36-django{111,20}-backend{Basic,Allauth}
+  py35-django{111,22}-backend{Basic,Allauth}
+  py36-django{111,22}-backend{Basic,Allauth}
+  py37-django{111,22}-backend{Basic,Allauth}
+  py38-django22-backend{Basic,Allauth}
   flake8
 
 [pytest]
@@ -13,9 +14,9 @@ python_files = tests.py test_*.py
 setenv =
   PYTHONWARNINGS = all
 deps =
-  -rrequirements.txt
-  django111: Django>=1.11,<2.0
-  django20: Django>=2.0a1,<2.1
+  -r requirements.txt
+  django111: Django>=1.11.17,<2.0
+  django22: Django>=2.2.6
   backendAllauth: django-allauth
 commands =
   python -V