Merge pull request #66 from sroet/rework_numpy_include

use better way to find numpy include directory
SBC-Utrecht · Aug 22, 2024 · 3a89e44 · 3a89e44
2 parents 43f7f6c + b899072
commit 3a89e44
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/environments/pytom_full.yaml b/environments/pytom_full.yaml
@@ -4,7 +4,7 @@ channels:
 dependencies:
 - python=3
 - ipython
-- numpy
+- numpy<2
 - lxml
 - scipy
 - boost

diff --git a/pytom/pytomc/compile.py b/pytom/pytomc/compile.py
@@ -182,7 +182,7 @@ def check4specialchars(path):
 if include_numpy is None:
     try:
         import numpy
-        path = os.path.join(numpy.__path__[0], 'core/include/numpy')
+        path = numpy.get_include()
         includePaths = [path] + includePaths
         includeFile,include_numpy = find("ndarrayobject.h",includePaths)    
     except Exception as e:

diff --git a/setup.py b/setup.py
@@ -62,7 +62,7 @@ def run(self):
     author='`FridoF',
     author_email='[email protected]',
     url='https://github.com/SBC-Utrecht/PyTom.git',
-    install_requires=['lxml', 'scipy', 'boost', 'numpy'],
+    install_requires=['lxml', 'scipy', 'boost', 'numpy>=1.18,<2'],
     extras_require={
         'gpu': ['cupy'],
         'gui': ['PyQt5', 'pyqtgraph', 'mrcfile'],
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ channels: @@
     dependencies:
     - python=3
     - ipython
-    - numpy
+    - numpy<2
     - lxml
     - scipy
     - boost
@@ Expand Down @@