Merge pull request #6160 from moreati/tox_fixup

TST: Fix running tests under Tox, add Python 3.4 to Tox environments

12 files changed, 46 insertions, 22 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 5b0691b20..976e283ed 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,6 +10,8 @@ include setupegg.py
 include site.cfg.example
 include numpy/random/mtrand/generate_mtrand_c.py
 recursive-include numpy/random/mtrand *.pyx *.pxd
+# Add build support that should go in sdist, but not go in bdist/be installed
+recursive-include numpy/_build_utils *
 # Adding scons build related files not found by distutils
 recursive-include numpy/core/code_generators *.py *.txt
 recursive-include numpy/core *.in *.h
diff --git a/numpy/_build_utils/README b/numpy/_build_utils/README
new file mode 100644
index 000000000..a817e9c5d
--- /dev/null
+++ b/numpy/_build_utils/README
@@ -0,0 +1,8 @@
+=======
+WARNING
+=======
+
+This directory (numpy/_build_utils) is *not* part of the pubic numpy API,
+ - it is internal build support for numpy.
+ - it is only present in source distributions or during an in place build
+ - it is *not* installed with the rest of numpy
diff --git a/numpy/build_utils/__init__.py b/numpy/_build_utils/__init__.py
index 1d0f69b67..1d0f69b67 100644
--- a/numpy/build_utils/__init__.py
+++ b/numpy/_build_utils/__init__.py
diff --git a/numpy/build_utils/apple_accelerate.py b/numpy/_build_utils/apple_accelerate.py
index d7351f4c5..d7351f4c5 100644
--- a/numpy/build_utils/apple_accelerate.py
+++ b/numpy/_build_utils/apple_accelerate.py
diff --git a/numpy/build_utils/common.py b/numpy/_build_utils/common.py
index 8435c462c..8435c462c 100644
--- a/numpy/build_utils/common.py
+++ b/numpy/_build_utils/common.py
diff --git a/numpy/build_utils/src/apple_sgemv_fix.c b/numpy/_build_utils/src/apple_sgemv_fix.c
index ffdfb81f7..ffdfb81f7 100644
--- a/numpy/build_utils/src/apple_sgemv_fix.c
+++ b/numpy/_build_utils/src/apple_sgemv_fix.c
diff --git a/numpy/build_utils/waf.py b/numpy/_build_utils/waf.py
index 263640d9e..263640d9e 100644
--- a/numpy/build_utils/waf.py
+++ b/numpy/_build_utils/waf.py
diff --git a/numpy/bento.info b/numpy/bento.info
index 9b91fe3ab..52b257543 100644
--- a/numpy/bento.info
+++ b/numpy/bento.info
@@ -3,7 +3,7 @@ Recurse:
 
 Library:
     Packages:
-        build_utils,
+        _build_utils,
         compat,
         core,
         core.code_generators,
diff --git a/numpy/core/bscript b/numpy/core/bscript
index c54e25272..4eea31ed7 100644
--- a/numpy/core/bscript
+++ b/numpy/core/bscript
@@ -13,9 +13,9 @@ waflib.Logs.verbose = 1
 # Importing this adds new checkers to waf configure context - I don't like this
 # way of working, should find a more explicit way to attach new functions to
 # context.
-import numpy.build_utils.waf
+import numpy._build_utils.waf
 
-from numpy.build_utils.apple_accelerate \
+from numpy._build_utils.apple_accelerate \
     import \
         get_sgemv_fix
 
@@ -104,18 +104,18 @@ def type_checks(conf):
     header_name = "Python.h"
     features = "c pyext"
     for c_type in ("int", "long", "short"):
-        macro_name = "SIZEOF_%s" % numpy.build_utils.waf.sanitize_string(c_type)
+        macro_name = "SIZEOF_%s" % numpy._build_utils.waf.sanitize_string(c_type)
         conf.check_declaration(macro_name, header_name=header_name,
                                features=features)
         NUMPYCONFIG_SYM.append((macro_name, macro_name))
 
     for c_type, e_size in (("float", 4), ("double", 8), ("long double", [12, 16])):
-        macro_name = "SIZEOF_%s" % numpy.build_utils.waf.sanitize_string(c_type)
+        macro_name = "SIZEOF_%s" % numpy._build_utils.waf.sanitize_string(c_type)
         size = conf.check_type_size(c_type, header_name=header_name,
                                     features=features, expected_sizes=e_size)
         NUMPYCONFIG_SYM.append((macro_name, str(size)))
 
-        macro_name = "SIZEOF_COMPLEX_%s" % numpy.build_utils.waf.sanitize_string(c_type)
+        macro_name = "SIZEOF_COMPLEX_%s" % numpy._build_utils.waf.sanitize_string(c_type)
         complex_def = "struct {%s __x; %s __y;}" % (c_type, c_type)
         size = conf.check_type_size(complex_def, header_name=header_name,
                                     features=features, expected_sizes=2*size)
@@ -126,12 +126,12 @@ def type_checks(conf):
 
     size = conf.check_type_size("Py_intptr_t", header_name=header_name,
                                 expected_sizes=[4, 8], features=features)
-    NUMPYCONFIG_SYM.append(('SIZEOF_%s' % numpy.build_utils.waf.sanitize_string("Py_intptr_t"),
+    NUMPYCONFIG_SYM.append(('SIZEOF_%s' % numpy._build_utils.waf.sanitize_string("Py_intptr_t"),
                            '%d' % size))
 
     size = conf.check_type_size("off_t", header_name=header_name,
                                 expected_sizes=[4, 8], features=features)
-    NUMPYCONFIG_SYM.append(('SIZEOF_%s' % numpy.build_utils.waf.sanitize_string("off_t"),
+    NUMPYCONFIG_SYM.append(('SIZEOF_%s' % numpy._build_utils.waf.sanitize_string("off_t"),
                            '%d' % size))
 
     # We check declaration AND type because that's how distutils does it.
@@ -219,7 +219,7 @@ def check_math_runtime(conf):
     features = "c pyext cprogram"
     for f in OPTIONAL_STDFUNCS_MAYBE:
         try:
-            conf.check_declaration("HAVE_%s" % numpy.build_utils.waf.sanitize_string(f),
+            conf.check_declaration("HAVE_%s" % numpy._build_utils.waf.sanitize_string(f),
                                     header_name=header_name,
                                     features=features)
             OPTIONAL_STDFUNCS.remove(f)
@@ -257,10 +257,10 @@ def check_complex(conf):
         for t in C99_COMPLEX_TYPES:
             try:
                 conf.check_type(t, header_name='complex.h')
-                NUMPYCONFIG_SYM.append(('DEFINE_NPY_HAVE_%s' % numpy.build_utils.waf.sanitize_string(t),
-                                        '#define NPY_HAVE_%s' % numpy.build_utils.waf.sanitize_string(t)))
+                NUMPYCONFIG_SYM.append(('DEFINE_NPY_HAVE_%s' % numpy._build_utils.waf.sanitize_string(t),
+                                        '#define NPY_HAVE_%s' % numpy._build_utils.waf.sanitize_string(t)))
             except waflib.Errors.ConfigurationError:
-                NUMPYCONFIG_SYM.append(('DEFINE_NPY_HAVE_%s' % numpy.build_utils.waf.sanitize_string(t), ''))
+                NUMPYCONFIG_SYM.append(('DEFINE_NPY_HAVE_%s' % numpy._build_utils.waf.sanitize_string(t), ''))
 
         for prec in ["", "f", "l"]:
             flist = [f + prec for f in C99_COMPLEX_FUNCS]
@@ -268,7 +268,7 @@ def check_complex(conf):
     else:
         NUMPYCONFIG_SYM.append(('DEFINE_NPY_USE_C99_COMPLEX', ''))
         for t in C99_COMPLEX_TYPES:
-            NUMPYCONFIG_SYM.append(('DEFINE_NPY_HAVE_%s' % numpy.build_utils.waf.sanitize_string(t), ''))
+            NUMPYCONFIG_SYM.append(('DEFINE_NPY_HAVE_%s' % numpy._build_utils.waf.sanitize_string(t), ''))
 
 def check_win32_specifics(conf):
     from numpy.distutils.misc_util import get_build_architecture
@@ -300,7 +300,7 @@ def post_configure(context):
     type_checks(conf)
     signal_smp_checks(conf)
     check_math_runtime(conf)
-    numpy.build_utils.waf.check_inline(conf)
+    numpy._build_utils.waf.check_inline(conf)
     check_complex(conf)
     check_win32_specifics(conf)
 
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 *
 
diff --git a/numpy/setup.py b/numpy/setup.py
index 2c3846271..58bb7dc93 100644
--- a/numpy/setup.py
+++ b/numpy/setup.py
@@ -5,19 +5,21 @@ from __future__ import division, print_function
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('numpy', parent_package, top_path)
+
+    # If you update this list, then also update the file numpy/bento.info
+    config.add_subpackage('compat')
+    config.add_subpackage('core')
     config.add_subpackage('distutils')
-    config.add_subpackage('testing')
+    config.add_subpackage('doc')
     config.add_subpackage('f2py')
-    config.add_subpackage('core')
-    config.add_subpackage('lib')
     config.add_subpackage('fft')
+    config.add_subpackage('lib')
     config.add_subpackage('linalg')
-    config.add_subpackage('random')
     config.add_subpackage('ma')
     config.add_subpackage('matrixlib')
-    config.add_subpackage('compat')
     config.add_subpackage('polynomial')
-    config.add_subpackage('doc')
+    config.add_subpackage('random')
+    config.add_subpackage('testing')
     config.add_data_dir('doc')
     config.add_data_dir('tests')
     config.make_config_py() # installs __config__.py
diff --git a/tox.ini b/tox.ini
index f84910299..a8f64f32d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,10 @@
 # installed and that they can be run as 'python2.7', 'python3.3', etc.
 
 [tox]
-envlist = py26,py27,py32,py33,py27-monolithic,py33-monolithic,py27-not-relaxed-strides,py33-not-relaxed-strides
+envlist =
+  py26,py27,py32,py33,py34,
+  py27-monolithic,py33-monolithic,py34-monolithic,
+  py27-not-relaxed-strides,py33-not-relaxed-strides,py34-not-relaxed-strides
 
 [testenv]
 deps=
@@ -41,6 +44,10 @@ env=NPY_SEPARATE_COMPILATION=0
 basepython=python3.3
 env=NPY_SEPARATE_COMPILATION=0
 
+[testenv:py34-monolithic]
+basepython=python3.4
+env=NPY_SEPARATE_COMPILATION=0
+
 [testenv:py27-not-relaxed-strides]
 basepython=python2.7
 env=NPY_RELAXED_STRIDES_CHECKING=0
@@ -49,6 +56,10 @@ env=NPY_RELAXED_STRIDES_CHECKING=0
 basepython=python3.3
 env=NPY_RELAXED_STRIDES_CHECKING=0
 
+[testenv:py34-not-relaxed-strides]
+basepython=python3.4
+env=NPY_RELAXED_STRIDES_CHECKING=0
+
 # Not run by default. Set up the way you want then use 'tox -e debug'
 # if you want it:
 [testenv:debug]