- Fixed bug where "python setup.py test" wasn't calling into

distutils appropriately, and errors would be emitted at the end
of the test suite.

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 27baca12744ee9a25ae1276b28e83bf12ae4d53f..eaa16cf3e5d1ae0da1125583b6b43a3d56e67e93 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,14 @@
     :version: 0.9.7
     :released:
 
+    .. change::
+        :tags: bug, tests
+        :versions: 1.0.0
+
+        Fixed bug where "python setup.py test" wasn't calling into
+        distutils appropriately, and errors would be emitted at the end
+        of the test suite.
+
     .. change::
         :tags: feature, postgresql
         :versions: 1.0.0

diff --git a/lib/sqlalchemy/testing/distutils_run.py b/lib/sqlalchemy/testing/distutils_run.py
new file mode 100644 (file)
index 0000000..d8f8f59
--- /dev/null
+++ b/lib/sqlalchemy/testing/distutils_run.py
@@ -0,0 +1,10 @@
+"""Quick and easy way to get setup.py test to run py.test without any
+custom setuptools/distutils code.
+
+"""
+import unittest
+import pytest
+
+class TestSuite(unittest.TestCase):
+    def test_sqlalchemy(self):
+        pytest.main()

diff --git a/setup.py b/setup.py
index ae4f8416c62d00436c8d7c4cd50490d6300a3fc4..81e3888744962772a865298b9f505e49fd5afd12 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -129,7 +129,7 @@ def run_setup(with_cext):
         license="MIT License",
         cmdclass=cmdclass,
         tests_require=['pytest >= 2.5.2', 'mock'],
-        test_suite="pytest.main",
+        test_suite="sqlalchemy.testing.distutils_run",
         long_description=readme,
         classifiers=[
             "Development Status :: 5 - Production/Stable",