From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 6 Apr 2015 01:55:40 +0000 (-0400)
Subject: - OK, forget it, the DBAPIs, etc. everything else is also site-wide,
X-Git-Tag: rel_1_0_0~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72329433e78e57c8589e4797df523bb598190b64;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- OK, forget it, the DBAPIs, etc. everything else is also site-wide,
we need site-packages
---

diff --git a/tox.ini b/tox.ini
index 0dd6ae5f4c..2bb5892070 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ envlist = full,py26,py27,py33,py34
 [testenv]
 deps=pytest
      mock
-     pytest-xdist
 
 # -E     : ignore PYTHON* environment variables (such as PYTHONPATH)
 # -s     : don't add user site directory to sys.path; also PYTHONNOUSERSITE
@@ -13,10 +12,9 @@ setenv=
     PYTHONPATH=
     PYTHONNOUSERSITE=1
 
-# don't accidentally use a SQLAlchemy that's globally installed during pip;
-# unfortunately, without usedevelop, no easy way to use systemwide
-# site-packages for dependencies
-sitepackages=False
+# we need this because our CI has all the DBAPIs and such
+# pre-installed in individual site-packages directories.
+sitepackages=True
 
 # always install fully and use that; this way options like
 # DISABLE_SQLALCHEMY_CEXT are honored