Skip to content

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

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
roryyorke merged 2 commits into from
Jun 21, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11061c1
Build fixes: query numpy path directly; setup pyproject.toml for pip
roryyorke Jun 18, 2019
96e1876
src_path is path to directory containing setup.py
roryyorke Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[build-system]
requires = ["setuptools", "wheel", "scikit-build", "cmake", "numpy"]
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def run(self):


def setup_package():
src_path = os.path.dirname(os.path.abspath(sys.argv[0]))
src_path = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, src_path)

# Rewrite the version file everytime
Expand Down