646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
27 lines
999 B
Diff
27 lines
999 B
Diff
diff --git a/admin/gildas-env.sh b/admin/gildas-env.sh
|
|
index acb06f9..b25ecd5 100644
|
|
--- a/admin/gildas-env.sh
|
|
+++ b/admin/gildas-env.sh
|
|
@@ -441,7 +441,7 @@ EOF
|
|
# Now search for Numpy
|
|
if python -c "import numpy" > /dev/null 2>&1; then
|
|
NUMPY_PRESENT=yes
|
|
- NUMPY_INC_DIR=`python -c "import numpy; print(numpy.__path__[0] + '/core/include')"`
|
|
+ NUMPY_INC_DIR=`python -c "import numpy; print(numpy.get_include())"`
|
|
if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
|
|
NUMPY_INC_PRESENT=yes
|
|
else
|
|
diff --git a/utilities/etc/setup.py.src b/utilities/etc/setup.py.src
|
|
index 9a4da86..110a0d1 100644
|
|
--- a/utilities/etc/setup.py.src
|
|
+++ b/utilities/etc/setup.py.src
|
|
@@ -75,7 +75,7 @@ mod_extras = mod_extras.split()
|
|
|
|
if (os.environ.get('NUMPY_PRESENT') == "yes"):
|
|
import numpy
|
|
- mod_inc_dirs.append(numpy.__path__[0] + '/core/include')
|
|
+ mod_inc_dirs.append(numpy.get_include())
|
|
else:
|
|
raise Exception("Numpy python package should be present. Aborting.")
|
|
|