From 3dc0da66fe5d6742752c9fe2504d46d98406e429 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 9 Mar 2023 16:48:06 +0100
Subject: [PATCH] WIP: [ogs_jupyter] Install pip packages from
requirements.txt.
---
ogscm/recipes/ogs.py | 4 ++++
ogscm/recipes/ogs_jupyter.py | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ogscm/recipes/ogs.py b/ogscm/recipes/ogs.py
index a2722dc..8228fcb 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 8703ac1..5ecdbd5 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}"',
]
--
GitLab