From 183ac5be31948e0447129f490ba4cf447a046319 Mon Sep 17 00:00:00 2001
From: Alexey Evseev <myhappydo@gmail.com>
Date: Mon, 15 Feb 2021 04:01:35 +0300
Subject: [PATCH] Simplify tox tests (#142)

* Simplify tox tests

* Update py39 env

* Update pip

* Update test dependencies

* Fix lint

* Downgrade cryptography for py36

* Fix tox.ini
---
 .travis.yml                             | 14 ++++++++++----
 example_project/config/settings_test.py |  2 +-
 requirements_test.txt                   |  8 ++++----
 tox.ini                                 | 21 +++++++++------------
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 297a258..484008e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: python
 
 matrix:
   include:
-    - python: 3.5
-      env: TOXENV=py35-django22
-
     - python: 3.6
       env: TOXENV=py36-django22
     - python: 3.6
@@ -19,12 +16,21 @@ matrix:
     - python: 3.7
       env: TOXENV=py37-django31
 
+    - python: 3.8
+      env: TOXENV=py38-django22
     - python: 3.8
       env: TOXENV=py38-django30
     - python: 3.8
       env: TOXENV=py38-django31
 
-install: pip install --quiet tox
+    - python: 3.9
+      env: TOXENV=py39-django22
+    - python: 3.9
+      env: TOXENV=py39-django30
+    - python: 3.9
+      env: TOXENV=py39-django31
+
+install: pip install --quiet --upgrade pip tox
 
 # command to run tests
 script: tox
diff --git a/example_project/config/settings_test.py b/example_project/config/settings_test.py
index 9dcd680..e4255aa 100644
--- a/example_project/config/settings_test.py
+++ b/example_project/config/settings_test.py
@@ -1,7 +1,7 @@
 " Settings for tests. "
 INSTALLED_APPS = []
 
-from .settings import *  # NOQA: F401, F403
+from .settings import *  # NOQA: E402, F401, F403
 
 # Databases
 DATABASES = {
diff --git a/requirements_test.txt b/requirements_test.txt
index 13278d3..a4fe03a 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,5 +1,5 @@
 pytest-django==4.1.0
-httpretty==0.9.6
-unittest2==1.0.1
-django-sslserver>=0.20
-flake8==3.7.9
+httpretty==1.0.5
+unittest2==1.1.0
+django-sslserver>=0.22
+flake8==3.8.4
diff --git a/tox.ini b/tox.ini
index dfc59e3..800118e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist=
-    py{36}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
-    py{37}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
-    py{38}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
-    py{39}-django{22, 30, 31}-core{30, 33, 34, 40}-coreapp{3, 4}
+    py{36}-django{22, 30, 31}
+    py{37}-django{22, 30, 31}
+    py{38}-django{22, 30, 31}
+    py{39}-django{22, 30, 31}
 
 [testenv]
 setenv =
@@ -13,19 +13,16 @@ basepython =
     py36: python3.6
     py37: python3.7
     py38: python3.8
-    py38: python3.9
+    py39: python3.9
 deps =
+    py36: cryptography<3.4
     djangorestframework<4.0
-    core30: social-auth-core>=3.0,<3.1
-    core33: social-auth-core>=3.3,<3.4
-    core34: social-auth-core>=3.4,<3.5
-    core40: social-auth-core>=4.0,<4.1
-    coreapp3: social-auth-app-django>=3.1,<4
-    coreapp4: social-auth-app-django>=4,<4.1
+    social-auth-core==4.0.3
+    social-auth-app-django==4.0.0
     djangorestframework-jwt
     djangorestframework_simplejwt
     django-rest-knox<5.0.0
-    django22: Django>=2.2,<2.3
+    django22: Django>=2.2.17,<2.3
     django30: Django>=3.0,<3.1
     django31: Django>=3.1,<3.2
     py37-django22: coverage