diff --git a/ogscm/recipes/ogs.py b/ogscm/recipes/ogs.py index a2722dc75c179b3e782b0abeb667bf452d63f2bf..8228fcb605ebbfab190f80358961a6c52c25b1fd 100644 --- a/ogscm/recipes/ogs.py +++ b/ogscm/recipes/ogs.py @@ -189,6 +189,10 @@ if local_args.ogs not in ["off", "clean"]: # != "off" and local_args.ogs != "cl ).stdout.rstrip() with open(f"{local_args.ogs}/web/data/versions.json") as fp: versions = json.load(fp) + with open(f"{local_args.ogs}/Tests/Data/requirements.txt") as fp: + # print(versions["python"]["jupyter_image"]["pip_packages"]) + versions["python"]["jupyter_image"]["pip_packages"] = fp.read().splitlines() + print(versions["python"]["jupyter_image"]["pip_packages"]) if "GITLAB_CI" in os.environ: if "CI_COMMIT_TAG" in os.environ: branch = "master" diff --git a/ogscm/recipes/ogs_jupyter.py b/ogscm/recipes/ogs_jupyter.py index 8703ac1dba00702543752c50b62964dec8f2c778..5ecdbd57a8f56d9b4b686e48d35a5ea718b2b0b2 100644 --- a/ogscm/recipes/ogs_jupyter.py +++ b/ogscm/recipes/ogs_jupyter.py @@ -38,11 +38,12 @@ Stage1 += packages( ) # for pip packages via git, for gmsh conda package conda_packages = [] -for package in versions["python"]["jupyter_image"]["conda_packages"]: - conda_packages.append(package) +# for package in versions["python"]["jupyter_image"]["conda_packages"]: +# conda_packages.append(package) pip_packages = [] for package in versions["python"]["jupyter_image"]["pip_packages"]: + print(package) pip_packages.append(package) vtk_rendering_backend = "osmesa" @@ -71,7 +72,7 @@ Stage1 += shell( # Install via shell (and not hpccm pip) to install into conda environment Stage1 += shell( commands=[ - f"pip --no-cache-dir install {' '.join(pip_packages)}", + f"pip --no-cache-dir install {' '.join(pip_packages)}", 'fix-permissions "${CONDA_DIR}"', 'fix-permissions "/home/${NB_USER}"', ]