diff --git a/.ci/Jenkinsfile_asic b/.ci/Jenkinsfile_asic index 6b97c6f8dffe8b3c08ab8c1997ab29195ce0814f..0169ae8bf77e166e7d07e912b1f3ab3838117dff 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 665907f515972a503fa7ab660f76259b5bec6a66..730cf04a90a1ffdd2c275fa4d72437ac84e67a68 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 be74a8e247781303027c96d54708e2f6f7121b10..1d1219ef02f7cf15164cfa399f3c6ace758df6b1 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=(\