Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit b73a40b

Browse files
committed
add debugging, fix for no deactivate
1 parent 3cf8f1e commit b73a40b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

config.sh

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ function build_libs {
2323
# the un-tar root directory, then the files are copied into /usr/local.
2424
# Could utilize a site.cfg instead to prevent the copy.
2525
python -mpip install urllib3
26+
python -c"import platform; print('platform.uname().machine', platform.uname().machine)"
2627
basedir=$(python numpy/tools/openblas_support.py)
2728
$use_sudo cp -r $basedir/lib/* /usr/local/lib
2829
$use_sudo cp $basedir/include/* /usr/local/include

extra_functions.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ function setup_test_venv {
22
# Create a new empty venv dedicated to testing for non-Linux platforms. On
33
# Linux the tests are run in a Docker container.
44
if [ $(uname) != "Linux" ]; then
5-
deactivate || echo ""
5+
if type -t deactivate ; then deactivate; fi
66
$PYTHON_EXE -m venv test_venv
77
if [ $(uname) == "Darwin" ]; then
88
source test_venv/bin/activate
@@ -21,7 +21,7 @@ function setup_test_venv {
2121

2222
function teardown_test_venv {
2323
if [ $(uname) != "Linux" ]; then
24-
deactivate || echo ""
24+
if type -t deactivate ; then deactivate; fi
2525
if [ $(uname) == "Darwin" ]; then
2626
source venv/bin/activate
2727
fi

0 commit comments

Comments
 (0)