diff options
author | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-10-15 23:12:20 +0200 |
---|---|---|
committer | Julian Taylor <jtaylor.debian@googlemail.com> | 2014-10-15 23:12:20 +0200 |
commit | 03f0aebf1a43c672f17e89382804809601828111 (patch) | |
tree | 54dff27e6027271b4c521e7154a48baceae27be7 /numpy/core/setup.py | |
parent | aa8a2437b700ce9a8c3e12652b75982e96a3777c (diff) | |
download | numpy-03f0aebf1a43c672f17e89382804809601828111.tar.gz |
MAINT: remove obsolete version checks
minimum requirement is python2.6, this allows removing a couple 2.3 and
2.4 checks.
Diffstat (limited to 'numpy/core/setup.py')
-rw-r--r-- | numpy/core/setup.py | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 971db9943..007a381ae 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -78,27 +78,13 @@ def is_npy_no_signal(): def is_npy_no_smp(): """Return True if the NPY_NO_SMP symbol must be defined in public header (when SMP support cannot be reliably enabled).""" - # Python 2.3 causes a segfault when - # trying to re-acquire the thread-state - # which is done in error-handling - # ufunc code. NPY_ALLOW_C_API and friends - # cause the segfault. So, we disable threading - # for now. - if sys.version[:5] < '2.4.2': - nosmp = 1 - else: - # Perhaps a fancier check is in order here. - # so that threads are only enabled if there - # are actually multiple CPUS? -- but - # threaded code can be nice even on a single - # CPU so that long-calculating code doesn't - # block. - try: - nosmp = os.environ['NPY_NOSMP'] - nosmp = 1 - except KeyError: - nosmp = 0 - return nosmp == 1 + # Perhaps a fancier check is in order here. + # so that threads are only enabled if there + # are actually multiple CPUS? -- but + # threaded code can be nice even on a single + # CPU so that long-calculating code doesn't + # block. + return 'NPY_NOSMP' in os.environ def win32_checks(deflist): from numpy.distutils.misc_util import get_build_architecture |