From 92bd3b968cfd95410eacef2c00baf91b9e19e5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20KUBLER?= <gregoire.kubler@proton.me>
Date: Fri, 28 Jun 2024 17:27:21 +0200
Subject: [PATCH] feat: new unified AIDGE_DEPENDENCIES syntax
---
.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1 | 3 ++-
pyproject.toml | 5 +----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1 b/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1
index 4a956ba..c2715ea 100644
--- a/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1
+++ b/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1
@@ -1,6 +1,7 @@
$ErrorActionPreference = "Stop"
-$AIDGE_DEPENDENCIES = Invoke-Expression $env:AIDGE_DEPENDENCIES
+# Retrieve and clean the dependencies string from the environment variable
+$AIDGE_DEPENDENCIES = $env:AIDGE_DEPENDENCIES -split ' '
Write-Host "Aidge dependencies : $AIDGE_DEPENDENCIES"
if ( $($AIDGE_DEPENDENCIES.Length) -eq 0) {
Write-Host "- No dependencies provided for current repsitory"
diff --git a/pyproject.toml b/pyproject.toml
index d02ff5a..3df3f10 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,12 +50,9 @@ test-command = "pytest {package}/aidge_backend_opencv/unit_tests"
### AIDGE DEPENDENCIES DECLARATION
# aidge_core do not rely on any aidge dependency, hence this string is empty
-[tool.cibuildwheel.linux.environment]
+[tool.cibuildwheel.environment]
AIDGE_DEPENDENCIES = "aidge_core" # format => "dep_1 dep_2 ... dep_n"
AIDGE_INSTALL="/host/AIDGE_INSTALL_CIBUILDWHEEL"
-[tool.cibuildwheel.windows.environment]
-AIDGE_DEPENDENCIES = '@("aidge_core")' # format => '@("dep_1","dep_2", ... ,"dep_n")'
-AIDGE_INSTALL="../AIDGE_INSTALL_CIBUILDWHEEL/"
[tool.cibuildwheel.linux]
before-build = [
"bash .gitlab/ci/cibuildwheel_install_opencv.sh /host && bash .gitlab/ci/cibuildwheel_build_deps_before_build_wheel.sh /host"
--
GitLab