TST: Fixed f2py test for non-versioned python executables

The 'sys.executable' can come in various names, but
the three main ones are "python", "python{major_version}",
and "python{major_version.minor_version}". The current
version of the f2py test assumes that only the latter
two are used. Since "f2py" is generally versioned,
using the executable basename "python" will make it
impossible to find. This commit fixes that issue
by using a sure-fire way of getting the Python version.

1 files changed, 13 insertions, 4 deletions

diff --git a/numpy/tests/test_scripts.py b/numpy/tests/test_scripts.py
index 2aed75eba..0fc7f879f 100644
--- a/numpy/tests/test_scripts.py
+++ b/numpy/tests/test_scripts.py
@@ -16,6 +16,7 @@ from numpy.testing import assert_
 
 is_inplace = isfile(pathjoin(dirname(np.__file__),  '..', 'setup.py'))
 
+
 def run_command(cmd, check_code=True):
     """ Run command sequence `cmd` returning exit code, stdout, stderr
 
@@ -73,10 +74,18 @@ def test_f2py():
         success = stdout.strip() == asbytes('2')
         assert_(success, "Warning: f2py not found in path")
     else:
-        # unclear what f2py cmd was installed as, check plain (f2py) and
-        # current python version specific one (f2py3.4)
-        f2py_cmds = ('f2py', 'f2py' + basename(sys.executable)[6:])
+        # unclear what f2py cmd was installed as, check plain (f2py),
+        # with major version (f2py3), or major/minor version (f2py3.4)
+        code, stdout, stderr = run_command([sys.executable, '-V'])
+
+        # for some reason, 'python -V' returns version in 'stderr' for
+        # Python 2.x but in 'stdout' for Python 3.x
+        version = (stdout or stderr)[7:].strip()
+        major, minor, revision = version.decode('utf-8').split('.')
+
+        f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor)
         success = False
+
         for f2py_cmd in f2py_cmds:
             try:
                 code, stdout, stderr = run_command([f2py_cmd, '-v'])
@@ -85,5 +94,5 @@ def test_f2py():
                 break
             except:
                 pass
-        msg = "Warning: neither %s nor %s found in path" % f2py_cmds
+        msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds
         assert_(success, msg)