- bootstrap support

- some workarounds to get 0.8 mostly working

diff --git a/alembic/testing/mock.py b/alembic/testing/mock.py
index f8162f84effb8092f9a5586b7f90db2f4fa1601b..5c8d07b15a3bbee7189a83a87589ac11e56ff2f1 100644 (file)
--- a/alembic/testing/mock.py
+++ b/alembic/testing/mock.py
@@ -1,2 +1,15 @@
+from __future__ import absolute_import
+
 from sqlalchemy.testing import mock
-from sqlalchemy.testing.mock import Mock, call, patch
+from sqlalchemy.testing.mock import Mock, call
+
+from alembic import util, compat
+
+if util.sqla_09:
+    from sqlalchemy.testing.mock import patch
+elif compat.py33:
+    from unittest.mock import patch
+else:
+    from mock import patch
+
+

diff --git a/run_tests.py b/run_tests.py
new file mode 100755 (executable)
index 0000000..41dba6d
--- /dev/null
+++ b/run_tests.py
@@ -0,0 +1,3 @@
+from sqlalchemy.testing import runner
+
+runner.main()

diff --git a/setup.cfg b/setup.cfg
index ab40b6b82bcf4700b6a4777b01bef148f3d774dd..5972b7377a5a063f8cc1f699b10f944d04ca8054 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,6 +11,9 @@ upload-dir = docs/build/output/html
 sign = 1
 identity = C4DAFEE1
 
+[nosetests]
+with-sqla_testing = true
+
 
 [sqla_testing]
 requirement_cls=tests.requirements:DefaultRequirements

diff --git a/setup.py b/setup.py
index 3918034cb6aa0583cec12ef49e800db8c17dc872..b9082cde1840e76714bc53c824de0a00107fd4f9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ setup(name='alembic',
       packages=find_packages('.', exclude=['examples*', 'test*']),
       include_package_data=True,
       tests_require=['nose >= 0.11', 'mock'],
-      test_suite="nose.collector",
+      test_suite="sqlalchemy.testing.runner.setup_py_test",
       zip_safe=False,
       install_requires=requires,
       entry_points={