Improved build system

.gitlab/ci/build.gitlab-ci.yml

@@ -144,14 +144,9 @@ build:ubuntu_python:
 
   script:
     # Download dependencies
-    # aidge_core (CPP)
-    - 'curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/5139/jobs/artifacts/main/download?job=build:ubuntu_cpp"'
-    - unzip -o build_artifacts.zip -d .
-    - rm -rf build_cpp
-    # aidge_backend_cpu (CPP)
-    - 'curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/5140/jobs/artifacts/master/download?job=build:ubuntu_cpp"'
+    # aidge_core (Python)
+    - 'curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/5139/jobs/artifacts/main/download?job=build:ubuntu_python"'
     - unzip -o build_artifacts.zip -d .
-    - rm -rf build_cpp
     # aidge_backend_cpu (Python)
     - 'curl --location --output build_artifacts.zip "https://gitlab.eclipse.org/api/v4/projects/5140/jobs/artifacts/master/download?job=build:ubuntu_python"'
     - unzip -o build_artifacts.zip -d .
@@ -159,8 +154,7 @@ build:ubuntu_python:
     - python3 -m pip install virtualenv
     - virtualenv venv
     - source venv/bin/activate
-    - export AIDGE_INSTALL=`pwd`/install
-    - export CMAKE_PREFIX_PATH=../install_cpp
+    - python3 -m pip install -r requirements.txt
     - python3 -m pip install .
 
   artifacts:
@@ -228,14 +222,9 @@ build:ubuntu_python:
 #     - $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
 #   script:
 #     # Download dependencies
-#     # aidge_core (CPP)
-#     - 'curl "https://gitlab.eclipse.org/api/v4/projects/5139/jobs/artifacts/main/download?job=build:windows_cpp" -o build_artifacts.zip'
+#     # aidge_core (Python)
+#     - 'curl "https://gitlab.eclipse.org/api/v4/projects/5139/jobs/artifacts/main/download?job=build:windows_python" -o build_artifacts.zip'
 #     - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force
-#     - Remove-Item .\build_cpp\ -Recurse
-#     # aidge_backend_cpu (CPP)
-#     - 'curl "https://gitlab.eclipse.org/api/v4/projects/5140/jobs/artifacts/master/download?job=build:windows_cpp" -o build_artifacts.zip'
-#     - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force
-#     - Remove-Item .\build_cpp\ -Recurse
 #     # aidge_backend_cpu (Python)
 #     - 'curl "https://gitlab.eclipse.org/api/v4/projects/5140/jobs/artifacts/master/download?job=build:windows_python" -o build_artifacts.zip'
 #     - Expand-Archive -Path .\build_artifacts.zip -DestinationPath . -Force
@@ -243,10 +232,7 @@ build:ubuntu_python:
 #     - python -m pip install virtualenv
 #     - virtualenv venv
 #     - venv\Scripts\Activate.ps1
-#     # Numpy dependancy for unit test
-#     - python -m pip install numpy
-#     - $env:AIDGE_INSTALL = "$pwd" + "install"
-#     - $env:CMAKE_PREFIX_PATH = "../install_cpp"
+#     - python -m pip install -r requirements.txt
 #     - python -m pip install .
 #   artifacts:
 #     expire_in: 1 week

setup.py

@@ -108,6 +108,7 @@ if __name__ == '__main__':
         cmdclass={
             'build_ext': CMakeBuild,
         },
+        install_requires=['aidge_core', 'aidge_backend_cpu'],
         zip_safe=False,
 
     )