From 6df426513defbeff3996d732f1ea2bf07d85144b Mon Sep 17 00:00:00 2001
From: gregoire kubler <gregoire.kubler@proton.me>
Date: Mon, 6 May 2024 17:32:12 +0200
Subject: [PATCH] fix : various bugs for release on windows
---
...ildwheel_build_deps_before_build_wheel.ps1 | 35 +++++++------------
pyproject.toml | 5 ++-
setup.py | 1 -
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1 b/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1
index af9cabc50..256aaf6a2 100644
--- a/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1
+++ b/.gitlab/ci/cibuildwheel_build_deps_before_build_wheel.ps1
@@ -1,30 +1,21 @@
+$ErrorActionPreference = "Stop"
if ($($env:AIDGE_DEPENDENCIES -split " ").Length -eq 0) {
Write-Host "- No dependencies provided for current repsitory"
New-Item -ItemType Directory -Force -Path ".\build" | Out-Null
Remove-Item -Path ".\build\*" -Recurse -Force
} else {
- Write-Host "Retrieving given dependencies to build current package : $env:AIDGE_DEPENDENCIES"
+ Write-Host "Retrieving given dependencies to build current package : $env:AIDGE_DEPENDENCIES"
foreach ($dep in $($env:AIDGE_DEPENDENCIES -split " ")) {
- Write-Host "Retrieving : $dep"
- $dep_path = Get-ChildItem -Path "/host/home/" -Directory -Filter $dep -Recurse |
- Where-Object { $_.FullName -notmatch 'install' -and
- $_.FullName -notmatch '.git' -and
- $_.FullName -notmatch 'miniconda' -and
- $_.FullName -notmatch 'conda' -and
- $_.FullName -notmatch '.local' -and
- $_.FullName -notmatch 'lib' -and
- $_.FullName -notmatch "\\$dep\\$dep" } |
- Select-Object -First 1 -ExpandProperty FullName
-
- if (-not [string]::IsNullOrEmpty($dep_path)) {
- Write-Host "Retrieving : $dep"
- Set-Location $dep_path
- New-Item -Path ".\build" -ItemType Directory -Force | Out-Null
- Get-ChildItem -Path ".\build" -File | Remove-Item -Force
- pip install . -Verbose
- } else {
- throw "$dep not found, aborting."
- }
+ Write-Host "Retrieving : $dep"
+ $curr_loc=$(Get-Location)
+ Set-Location ../$dep
+ Write-Host "YYEETEEEEEEEEEEEEt"
+ Get-Location
+ Get-ChildItem .
+ New-Item -Path ".\build" -ItemType Directory -Force | Out-Null
+ Get-ChildItem -Path ".\build" -File | Remove-Item -Force
+ python -m pip install . -v
+ Set-Location $curr_loc
}
-}
+}
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index f65baadad..272c55cab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
[project]
name = "aidge_core"
-description="Core implementations of the operators and graph of aidge framework"
-dependencies = ["numpy>=1.26.4"]
+description="Core alogrithms for operators and graph of the AIDGE framework"
+dependencies = ["numpy>=1.21.6"]
requires-python = ">= 3.7"
readme = "README.md"
license = { file = "LICENSE" }
@@ -32,7 +32,6 @@ write_to = "aidge_core/_version.py"
# CIBUILDWHEEL
[tool.cibuildwheel]
build-frontend = "build"
-
### AIDGE DEPENDENCIES DECLARATION
# aidge_core do not rely on any aidge dependency, hence this string is empty
[tool.cibuildwheel.linux.environment]
diff --git a/setup.py b/setup.py
index 5dd0754ee..5b2c15709 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,6 @@ from setuptools.command.build_ext import build_ext
def get_project_name() -> str:
with open(pathlib.Path().absolute() / "pyproject.toml", "r") as file :
project_toml = toml.load(file)
- print(f"project_name = {project_toml["project"]["name"]}")
return project_toml["project"]["name"]
--
GitLab