From da2113aba1bb621e03a8efdedfebe42f9b6afcac Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 24 Nov 2025 08:53:14 +0100 Subject: [PATCH 1/4] Update dependencies and SIP build configuration Bump cpython to 3.12.7 and nlopt to 2.10.0 in requirements. Adjust SIP build step to use the full path to sip-build from the CPython Scripts directory for improved reliability. --- conanfile.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8a62f06..568a6b4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -70,8 +70,8 @@ def export_sources(self): def requirements(self): for req in self.conan_data["requirements"]: self.requires(req) - self.requires("cpython/3.12.2") - self.requires("nlopt/2.7.1") + self.requires("cpython/3.12.7") + self.requires("nlopt/2.10.0") # Although not a direct dependency, clipper is for some reason required at link-time self.requires("clipper/6.4.2@ultimaker/stable") @@ -124,7 +124,9 @@ def generate(self): # Generate the Source code from SIP tc = self.python_requires["sipbuildtool"].module.SipBuildTool(self) - tc.configure() + # Use the full path to sip-build from the CPython Scripts directory + sip_build_path = os.path.join(self.dependencies["cpython"].cpp_info.bindirs[0], "Scripts", "sip-build.exe") + tc.configure(sip_install_executable=sip_build_path) tc.build() def layout(self): From b16baaf840ac5d8390d01058861f9156d8010d67 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Dec 2025 11:43:43 +0100 Subject: [PATCH 2/4] Improve sip-build detection for cross-platform support Replaces hardcoded sip-build path with auto-detection using the CPython dependency, making the build process more robust and platform-independent. --- conanfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 568a6b4..6ef6430 100644 --- a/conanfile.py +++ b/conanfile.py @@ -124,9 +124,8 @@ def generate(self): # Generate the Source code from SIP tc = self.python_requires["sipbuildtool"].module.SipBuildTool(self) - # Use the full path to sip-build from the CPython Scripts directory - sip_build_path = os.path.join(self.dependencies["cpython"].cpp_info.bindirs[0], "Scripts", "sip-build.exe") - tc.configure(sip_install_executable=sip_build_path) + # Auto-detect sip-build from CPython dependency (cross-platform) + tc.configure(cpython_dependency=self.dependencies["cpython"]) tc.build() def layout(self): From f12fccf2f37d6aecb8083a0c8a25555241a2ca9f Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 1 Mar 2026 11:40:13 +0100 Subject: [PATCH 3/4] Bump conandata version to 5.12.0-alpha.0 Update conandata.yml to target the 5.12.0-alpha.0 release. The package version and the nested requirement for nest2d were updated from 5.10.0 to 5.12.0-alpha.0 to track the new alpha release. --- conandata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 9f70494..8e2ff94 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.10.0" +version: "5.12.0-alpha.0" requirements: - - "nest2d/5.10.0" + - "nest2d/5.12.0-alpha.0" From b23fef32f657f7c8b97bae4a8c9435c736f300b6 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 5 May 2026 10:26:06 +0200 Subject: [PATCH 4/4] Set version according to semver Minor version increase in dependencies which dictates minor version increase in package --- conandata.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 8e2ff94..9ccf501 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.12.0-alpha.0" +version: "5.11.0-alpha.0" requirements: - - "nest2d/5.12.0-alpha.0" + - "nest2d/5.11.0-alpha.0"