From 253f2e3b055149c5c633b6fe1cf0d0476c72fe90 Mon Sep 17 00:00:00 2001 From: gregoire kubler <gregoire.kubler@proton.me> Date: Fri, 28 Jun 2024 15:13:30 +0200 Subject: [PATCH] feat : new unified format for AIDGE_DEPENDENCIES --- .../ci/cibuildwheel_build_deps_before_build_wheel.ps1 | 3 ++- pyproject.toml | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1 b/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1 index ff8a3101..c2715ea5 100755 --- 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 855238ef..7e3b1ca4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,18 +41,16 @@ build-frontend = "build" test-requires = "pytest" test-command = "pytest {project}/aidge_backend_cpu/unit_tests" # uncomment to run cibuildwheel locally on selected distros -# build=[ +build=[ # "cp38-manylinux_x86_64", # "cp39-manylinux_x86_64", # "cp310-manylinux_x86_64" -# ] + "cp38-win_amd64", +] ### AIDGE DEPENDENCIES DECLARATION -[tool.cibuildwheel.linux.environment] +[tool.cibuildwheel.environment] AIDGE_DEPENDENCIES = "aidge_core" # format => "dep_1 dep_2 ... dep_n" AIDGE_INSTALL="/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_build_deps_before_build_wheel.sh /host" -- GitLab