From 9dfef8b60aff5faed59632484f1cae276a7f2c06 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Mon, 24 Nov 2025 08:54:49 +0100 Subject: [PATCH 1/6] Update CPython version and SIP build configuration Bumps CPython dependency from 3.12.2 to 3.12.7 and modifies SIP build tool configuration to use the full path to sip-build.exe from the CPython Scripts directory for improved reliability. --- conanfile.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 07b1104..d8ad606 100644 --- a/conanfile.py +++ b/conanfile.py @@ -69,7 +69,7 @@ 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("cpython/3.12.7") def validate(self): if self.settings.compiler.cppstd: @@ -116,7 +116,9 @@ def generate(self): # Generate the Source code from SIP sip = self.python_requires["sipbuildtool"].module.SipBuildTool(self) - sip.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") + sip.configure(sip_install_executable=sip_build_path) sip.build() def layout(self): From 61fc6b5b3a954254356de5c8e13129bbbc2d875f Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Dec 2025 11:44:48 +0100 Subject: [PATCH 2/6] Refactor SIP build tool configuration for cross-platform support Replaces hardcoded Windows-specific sip-build path with auto-detection using the CPython dependency. This improves compatibility across different platforms. --- conanfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index d8ad606..9676ef9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -116,9 +116,8 @@ def generate(self): # Generate the Source code from SIP sip = 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") - sip.configure(sip_install_executable=sip_build_path) + # Auto-detect sip-build from CPython dependency (cross-platform) + sip.configure(cpython_dependency=self.dependencies["cpython"]) sip.build() def layout(self): From 9e67d084cc6a490797fd6a20ec9498c9bd26fc5d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 1 Mar 2026 10:08:22 +0100 Subject: [PATCH 3/6] Bump conandata version to 5.12.0-alpha.0 Update conandata.yml version from 5.11.0-alpha.0 to 5.12.0-alpha.0. The requirements entry (savitar/5.11.0-alpha.0) was left unchanged. --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 84d983a..2a3dc24 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.11.0-alpha.0" +version: "5.12.0-alpha.0" requirements: - "savitar/5.11.0-alpha.0" From 6fa216082b626a762d8af1d6f38f71133d910cf7 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 5 May 2026 10:22:44 +0200 Subject: [PATCH 4/6] Set version according to semver Change in patch version of dependency indicates a need for a patch version increase rather than a minor version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 2a3dc24..2450b11 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.12.0-alpha.0" +version: "5.11.1-alpha.0" requirements: - "savitar/5.11.0-alpha.0" From 9f0b5ca74ec0b4e8f69ec90b2ea829ec0fea385d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 5 May 2026 11:26:12 +0200 Subject: [PATCH 5/6] Remove the alpha tag --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 2450b11..366ce59 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.11.1-alpha.0" +version: "5.11.1" requirements: - "savitar/5.11.0-alpha.0" From 0eea3968688a47e21285716cbbd8aa0ba12895a0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 5 May 2026 11:31:22 +0200 Subject: [PATCH 6/6] Revert last commit put the tag back until testing is done --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 366ce59..2450b11 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,3 +1,3 @@ -version: "5.11.1" +version: "5.11.1-alpha.0" requirements: - "savitar/5.11.0-alpha.0"