Build fixes: query numpy path directly; setup pyproject.toml for pip

python-control · Jun 18, 2019 · 11061c1 · 11061c1
1 parent 64c6df3
commit 11061c1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
 # base site dir, use python installation for location specific includes
 execute_process(
   COMMAND "${PYTHON_EXECUTABLE}" -c
-  "from distutils.sysconfig import get_python_lib as pl; print(pl())"
+  "import os,numpy; print(os.path.dirname(numpy.__path__[0]))"
   OUTPUT_VARIABLE PYTHON_SITE
   OUTPUT_STRIP_TRAILING_WHITESPACE)
 if(WIN32)

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,6 +6,7 @@ include README.rst
 include MANIFEST.in
 include setup.cfg.in
 include CMakeLists.txt
+include pyproject.toml
 include slycot/CMakeLists.txt
 include slycot/tests/CMakeLists.txt
 include slycot/*.py

diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "scikit-build", "cmake", "numpy"]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[build-system]
		requires = ["setuptools", "wheel", "scikit-build", "cmake", "numpy"]