From d40b5a0079f7189aa581e90ba9e3feffaf557a47 Mon Sep 17 00:00:00 2001
From: Philipp Spilger <philipp.spilger@kip.uni-heidelberg.de>
Date: Wed, 29 Nov 2023 13:55:19 +0100
Subject: [PATCH] feat: Change python used by asic spack to python3
* change python3 to 3.8.3 to reflect base install version
Depends-On: 21800
Change-Id: I34e4c33a68b23b9acda09cee48b7783c7bc2d6f7
---
.ci/Jenkinsfile_asic | 2 +-
.ci/asic_create_recipe.sh | 3 +++
.ci/asic_spack_collection.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic
index 6b97c6f8..0169ae8b 100755
--- a/.ci/Jenkinsfile_asic
+++ b/.ci/Jenkinsfile_asic
@@ -38,7 +38,7 @@ pipeline {
DOCKER_BASE_IMAGE = "centos:7"
// versions from system packages
DEPENDENCY_PYTHON = "python@2.7.5"
- DEPENDENCY_PYTHON3 = "python@3.6.8"
+ DEPENDENCY_PYTHON3 = "python@3.8.3"
YASHCHIKI_IMAGE_NAME = "singularity_asic_temp.img"
YASHCHIKI_SANDBOXES = "sandboxes"
YASHCHIKI_PROXY_HTTP = "http://proxy.kip.uni-heidelberg.de:8080"
diff --git a/.ci/asic_create_recipe.sh b/.ci/asic_create_recipe.sh
index 665907f5..730cf04a 100755
--- a/.ci/asic_create_recipe.sh
+++ b/.ci/asic_create_recipe.sh
@@ -202,6 +202,9 @@ From: ${DOCKER_BASE_IMAGE}
# YS: teststand dependencies (no python in spack yet)
/opt/conda/bin/conda install -y numpy matplotlib
+ # PS: needed for notebook package below
+ /opt/conda/bin/conda install -c conda-forge -y importlib_metadata
+
# PD: jupyter notebook and ipython for more comfort
/opt/conda/bin/conda install -c conda-forge -y notebook
/opt/conda/bin/conda install -c conda-forge -y nb_conda_kernels
diff --git a/.ci/asic_spack_collection.sh b/.ci/asic_spack_collection.sh
index be74a8e2..1d1219ef 100644
--- a/.ci/asic_spack_collection.sh
+++ b/.ci/asic_spack_collection.sh
@@ -1,7 +1,7 @@
# All spack packages that should be fetched/installed in the container
spack_packages=(
# "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" # FIXME
- "visionary-asic ^${DEPENDENCY_PYTHON} %${YASHCHIKI_SPACK_GCC}"
+ "visionary-asic ^${DEPENDENCY_PYTHON3} %${YASHCHIKI_SPACK_GCC}"
)
spack_views=(\
--
GitLab