From 53387f81dafba7f7e852da38e8f1053644aa0e6a Mon Sep 17 00:00:00 2001
From: Mike <22396211+Dresdn@users.noreply.github.com>
Date: Sun, 4 Jul 2021 09:17:08 -0700
Subject: [PATCH] test: cleanup tox config

---
 tox.ini | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tox.ini b/tox.ini
index aada814..1d5da5b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,20 @@
 [tox]
 isolated_build = true
 envlist =
-    py{35,36,37,38,39}-django22
-    py{36,37,38,39}-django{30,31,32,tip}
+  py{36,37,38,39}-django22
+  py{36,37,38,39}-django{30,31,32}
+  py{38,39}-djangomain
 
 [testenv]
-locked_deps =
-    pytest
-    pytest-cov
+allowlist_externals =
+  pytest
+  coverage
 deps =
-    django22: django>=2.2,<2.3
-    django31: Django >= 3.1, <3.2
-    django32: Django >= 3.2
-    djangotip: https://github.com/django/django/archive/refs/heads/main.tar.gz
-commands = pytest --cov {envsitepackagesdir}/eav --import-mode=importlib
-whitelist_externals = pytest
+  django22: django ~= 2.2.0
+  django30: django ~= 3.0.0
+  django31: django ~= 3.1.0
+  django32: django ~= 3.2.0
+  djangomain: https://github.com/django/django/archive/main.tar.gz
+commands =
+  pytest --cov {envsitepackagesdir}/eav
+  coverage combine