diff options
| -rw-r--r-- | MANIFEST.in | 3 | ||||
| -rwxr-xr-x | run-tests.py | 37 | ||||
| -rwxr-xr-x | setup.py | 11 | ||||
| -rwxr-xr-x | src/greenlet/tests/test_version.py | 15 |
4 files changed, 19 insertions, 47 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 21f02e8..6dd962c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -37,10 +37,7 @@ include LICENSE include LICENSE.PSF include MANIFEST.in -### XXX: Move these to a subdirectory. include make-manylinux -include make-manifest -include make-win-release global-exclude *.pyc global-exclude *.pyd diff --git a/run-tests.py b/run-tests.py deleted file mode 100755 index ec40fd6..0000000 --- a/run-tests.py +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env python -from __future__ import print_function - -import sys -import os -import struct -import unittest - - -verbosity = 2 -here = os.path.dirname(os.path.abspath(__file__)) -os.chdir(here) - - -def bits(): - """determine if running on a 32 bit or 64 bit platform - """ - return struct.calcsize("P") * 8 - - - -# -- find greenlet but skip the one in "." -oldpath = sys.path[:] -sys.path.remove(here) - -import greenlet - -sys.path[:] = oldpath - -print("python %s (%s bit) using greenlet %s from %s\n" % - (sys.version.split()[0], bits(), greenlet.__version__, greenlet.__file__)) - -# -- run tests -from tests import test_collector -result = unittest.TextTestRunner(verbosity=verbosity).run(test_collector()) -if result.failures or result.errors: - sys.exit(1) @@ -71,10 +71,13 @@ else: ] + _find_platform_headers() ), # Test extensions. - # XXX: We used to try hard to not include these in built - # distributions. That's really not important, at least not once we have a clean - # layout with the test directory nested inside a greenlet directory. - # See https://github.com/python-greenlet/greenlet/issues/184 and 189 + # + # We used to try hard to not include these in built + # distributions, because we only distributed ``greenlet.so``. + # That's really not important, now we have a clean layout with + # the test directory nested inside a greenlet directory. See + # https://github.com/python-greenlet/greenlet/issues/184 and + # 189 Extension( name='greenlet.tests._test_extension', sources=[GREENLET_TEST_DIR + '_test_extension.c'], diff --git a/src/greenlet/tests/test_version.py b/src/greenlet/tests/test_version.py index f4ea056..44f2ef0 100755 --- a/src/greenlet/tests/test_version.py +++ b/src/greenlet/tests/test_version.py @@ -30,9 +30,18 @@ class VersionTests(unittest.TestCase): try: greenlet_h = find_dominating_file('greenlet.h') except AssertionError as e: - if '.tox' in os.path.abspath(os.path.dirname(__file__)): - raise unittest.SkipTest("Unable to find greenlet.h while running in tox") - raise + if '.tox' not in os.path.abspath(os.path.dirname(__file__)): + raise + # If we're in tox, we can recover. + greenlet_h = os.path.join( + os.path.dirname(setup_py), + 'src', + 'greenlet', + 'greenlet.h' + ) + if not os.path.exists(greenlet_h): + raise # Something must have changed in the layout. Fix this test. + with open(greenlet_h) as f: greenlet_h = f.read() |