From 97db465c0500f49629f0e5a2cedbef56e54bf14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Simonis?= Date: Thu, 4 Jul 2024 22:59:46 +0200 Subject: [PATCH 1/3] Fixes the numpy include order (#204) --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a82e8569..31750061 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,7 @@ def get_extensions(is_test): compile_args = [] link_args = [] compile_args.append("-std=c++17") - compile_args.append("-I{}".format(numpy.get_include())) + include_dirs = [numpy.get_include()] bindings_sources = [os.path.join(PYTHON_BINDINGS_PATH, "cyprecice", "cyprecice" + ".pyx")] @@ -84,6 +84,7 @@ def get_extensions(is_test): sources=bindings_sources, libraries=[], language="c++", + include_dirs=include_dirs, extra_compile_args=compile_args, extra_link_args=link_args ) From 0c2e43f5db1429f3a52e36759210acd67b19950b Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Mon, 8 Jul 2024 11:22:47 +0200 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 221d3366..89c9e2f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## latest + +* Fix NumPy include order to not conflict with system NumPy and the one installed via pip https://github.com/precice/python-bindings/pull/204 + ## v3.1.0 * Change versioning scheme https://github.com/precice/python-bindings/pull/199 From fa66c6339a6234552d2f1dda6815a37030800dec Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Mon, 8 Jul 2024 11:25:41 +0200 Subject: [PATCH 3/3] Bump version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89c9e2f7..8741bca3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## latest +## v3.1.1 * Fix NumPy include order to not conflict with system NumPy and the one installed via pip https://github.com/precice/python-bindings/pull/204