- we really don't want to force lib here, but we do need

it for the plain "pytest" case, so do an append instead of an insert
- add a new tox file to do a full regen of callcounts

diff --git a/regen_callcounts.tox.ini b/regen_callcounts.tox.ini
new file mode 100644 (file)
index 0000000..056208c
--- /dev/null
+++ b/regen_callcounts.tox.ini
@@ -0,0 +1,28 @@
+[tox]
+envlist = py{27,33,34}-sqla_{cext,nocext}-db_{sqlite,postgresql,mysql}
+
+[base]
+basecommand=
+       python -m pytest test/aaa_profiling -k "not memusage" --force-write-profiles
+
+[testenv]
+deps=pytest
+        mock
+        py{27,33,34}-sqla_{cext,nocext}-db_{postgresql}: psycopg2
+        py{27}-sqla_{cext,nocext}-db_{mysql}: mysql-python
+        py{33,34}-sqla_{cext,nocext}-db_{mysql}: pymysql
+
+usedevelop=False
+sitepackages=True
+
+
+commands=
+       py{27}-sqla_{cext,nocext}-db_{mysql}: {[base]basecommand} --db mysql {posargs}
+       py{33,34}-sqla_{cext,nocext}-db_{mysql}: {[base]basecommand} --db pymysql {posargs}
+       db_{postgresql}: {[base]basecommand} --db postgresql {posargs}
+       db_{sqlite}: {[base]basecommand} --db sqlite {posargs}
+
+setenv=
+       sqla_nocext: DISABLE_SQLALCHEMY_CEXT=1
+
+

diff --git a/sqla_nose.py b/sqla_nose.py
index b977f4bf56e9b5d5e4738ad503150c465eac0e04..fc55f34f78c1ae0ac44101c8bab35b988be47870 100755 (executable)
--- a/sqla_nose.py
+++ b/sqla_nose.py
@@ -12,8 +12,8 @@ import os
 
 
 for pth in ['./lib']:
-    sys.path.insert(
-        0, os.path.join(os.path.dirname(os.path.abspath(__file__)), pth))
+    sys.path.append(
+        os.path.join(os.path.dirname(os.path.abspath(__file__)), pth))
 
 # use bootstrapping so that test plugins are loaded
 # without touching the main library before coverage starts

diff --git a/test/conftest.py b/test/conftest.py
index c697085ee9c5923dd8f3ddd666d0db472496d8cc..590b357005812866fdd6d179efdbb5c370be868f 100755 (executable)
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -10,8 +10,7 @@ import sys
 import os
 
 for pth in ['../lib']:
-    sys.path.insert(
-        0,
+    sys.path.append(
         os.path.join(os.path.dirname(os.path.abspath(__file__)), pth))