diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-05 13:14:35 -0400 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-05 13:14:35 -0400 |
| commit | 399bf25c7b25ae448ae41df32ec2d27aa58223f1 (patch) | |
| tree | 58073bb791ea63c88b99db377f2f98828d3fc38f /numpy/core/setup.py | |
| parent | 9cd868a00cc488478ac4f07ee0b5452a38cb3cc0 (diff) | |
| parent | eb0caab1c6d3fdad45b7c534c933e8bd738faf4e (diff) | |
| download | numpy-399bf25c7b25ae448ae41df32ec2d27aa58223f1.tar.gz | |
Merge pull request #6160 from moreati/tox_fixup
TST: Fix running tests under Tox, add Python 3.4 to Tox environments
Diffstat (limited to 'numpy/core/setup.py')
| -rw-r--r-- | numpy/core/setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 9221bd2c4..99084b25e 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -10,7 +10,8 @@ from os.path import join from numpy.distutils import log from distutils.dep_util import newer from distutils.sysconfig import get_config_var -from numpy.build_utils.apple_accelerate import uses_accelerate_framework, get_sgemv_fix +from numpy._build_utils.apple_accelerate import (uses_accelerate_framework, + get_sgemv_fix) from setup_common import * |