10000 BUG: fix issue on OS X with Python 3.x where npymath.ini was not installed by rgommers · Pull Request #7735 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: fix issue on OS X with Python 3.x where npymath.ini was not installed #7735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2016
Merged

BUG: fix issue on OS X with Python 3.x where npymath.ini was not installed #7735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
8000
Diff view
Diff view
12 changes: 6 additions & 6 deletions numpy/distutils/misc_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ def allpath(name):
return os.path.join(*splitted)

def rel_path(path, parent_path):
"""Return path relative to parent_path.
"""
pd = os.path.abspath(parent_path)
apath = os.path.abspath(path)
if len(apath)<len(pd):
"""Return path relative to parent_path."""
# Use realpath to avoid issues with symlinked dirs (see gh-7707)
pd = os.path.realpath(os.path.abspath(parent_path))
apath = os.path.realpath(os.path.abspath(path))
if len(apath) < len(pd):
return path
if apath==pd:
if apath == pd:
return ''
if pd == apath[:len(pd)]:
assert apath[len(pd)] in [os.sep], repr((path, apath[len(pd)]))
Expand Down
9 changes: 8 additions & 1 deletion numpy/distutils/tests/test_misc_util.py
94CD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from os.path import join, sep, dirname

from numpy.distutils.misc_util import (
appendpath, minrelpath, gpaths, get_shared_lib_extension
appendpath, minrelpath, gpaths, get_shared_lib_extension, get_info
)
from numpy.testing import (
TestCase, run_module_suite, assert_, assert_equal
Expand Down Expand Up @@ -75,5 +75,12 @@ def test_get_shared_lib_extension(self):
# just check for no crash
assert_(get_shared_lib_extension(is_python_ext=True))


def test_installed_npymath_ini():
# Regression test for gh-7707. If npymath.ini wasn't installed, then this
# will give an error.
info = get_info('npymath')


if __name__ == "__main__":
run_module_suite()
0