Merge pull request #6160 from moreati/tox_fixup

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

1 files changed, 8 insertions, 6 deletions

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