From e1602d9ba36a916b55e15e47f3c61e17d17afa89 Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Mon, 12 Apr 2021 15:37:11 +0200 Subject: Always run garbage collection explicitly in PyPy for the GC-related NumPy tests. --- tests/memoryview/numpy_memoryview.pyx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/memoryview/numpy_memoryview.pyx b/tests/memoryview/numpy_memoryview.pyx index 0d6f9e12f..44038bc9c 100644 --- a/tests/memoryview/numpy_memoryview.pyx +++ b/tests/memoryview/numpy_memoryview.pyx @@ -17,6 +17,10 @@ include "../buffers/mockbuffers.pxi" ctypedef np.int32_t dtype_t +IS_PYPY = hasattr(sys, 'pypy_version_info') +NUMPY_VERSION = tuple(int(v) for v in np.__version__.split('.')[:2]) +print(NUMPY_VERSION) + def get_array(): # We need to type our array to get a __pyx_get_buffer() that typechecks # for np.ndarray and calls __getbuffer__ in numpy.pxd @@ -39,15 +43,13 @@ def testcase(f): return f def testcase_numpy_1_5(f): - major, minor, *rest = np.__version__.split('.') - if (int(major), int(minor)) >= (1, 5): + if NUMPY_VERSION >= (1, 5) or IS_PYPY: __test__[f.__name__] = f.__doc__ return f def gc_collect_if_required(): - major, minor, *rest = np.__version__.split('.') - if (int(major), int(minor)) >= (1, 14): + if NUMPY_VERSION >= (1, 14) or IS_PYPY: import gc gc.collect() -- cgit v1.2.1