From 91db10b10c351331010f6a93fe4fd5378a03eeac Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Wed, 28 Apr 2021 19:07:42 -0500
Subject: [PATCH] Tweak tox config a bit per broken tests

---
 tox.ini | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/tox.ini b/tox.ini
index 3a0faeca..2ac683e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,42 +9,30 @@ deps =
         nose
 commands =
         pip install --upgrade pip
-        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer] rattail-tempmon
+        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
         nosetests {posargs}
 
 [testenv:py27]
-# TODO: this is only here to avoid "latest" packages which break us on python2.7
-deps =
-        coverage
-        fixture
-        mock
-        nose
-        SQLAlchemy<1.4
-        SQLAlchemy-Utils<0.36.7
+# TODO: this only adds the sa-utils restriction, per python2
+commands =
+        pip install --upgrade pip
+        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon SQLAlchemy-Utils<0.36.7
+        nosetests {posargs}
 
 [testenv:coverage]
 basepython = python3
-# TODO: capping sqlalchemy for now, to avoid issues w/ zope.sqlalchemy
-deps =
-    coverage
-    fixture
-    mock
-    nose
-    SQLAlchemy<1.4
 commands =
         pip install --upgrade pip
-        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer] rattail-tempmon
+        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
         nosetests {posargs:--with-coverage --cover-html-dir={envtmpdir}/coverage}
 
 [testenv:docs]
 basepython = python3
-# TODO: capping sqlalchemy for now, to avoid issues w/ zope.sqlalchemy
 deps =
     Sphinx
     sphinx-rtd-theme
-    SQLAlchemy<1.4
 changedir = docs
 commands =
         pip install --upgrade pip
-        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer] rattail-tempmon
+        pip install --upgrade --upgrade-strategy eager Tailbone rattail[auth,bouncer,db] rattail-tempmon
         sphinx-build -b html -d {envtmpdir}/doctrees -W -T . {envtmpdir}/docs