From a242e77e813cf2d64a3ab0a28c9a0ef610b038e6 Mon Sep 17 00:00:00 2001 From: Krishna Chilleri Date: Mon, 19 May 2025 15:17:21 -0600 Subject: [PATCH] hpc-beeflow: add github branch and remove v0.1.9 (#50518) * remove 0.1.9 version and downgrade version of cwl-utils * add github branch --- .../builtin/packages/hpc_beeflow/package.py | 19 +++++++++---------- .../builtin/packages/py_cwl_utils/package.py | 1 + 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/spack_repo/builtin/packages/hpc_beeflow/package.py b/var/spack/repos/spack_repo/builtin/packages/hpc_beeflow/package.py index 1bfa22621d7..14fc15e54b5 100644 --- a/var/spack/repos/spack_repo/builtin/packages/hpc_beeflow/package.py +++ b/var/spack/repos/spack_repo/builtin/packages/hpc_beeflow/package.py @@ -20,6 +20,7 @@ class HpcBeeflow(PythonPackage): homepage = "https://github.com/lanl/bee" pypi = "hpc_beeflow/hpc_beeflow-0.1.10.tar.gz" + git = "https://github.com/lanl/BEE.git" maintainers("pagrubel") @@ -27,14 +28,13 @@ class HpcBeeflow(PythonPackage): license("MIT") + version("spack-develop", branch="spack-develop") version("0.1.10", sha256="b7863798e15591a16f6cd265f9b5b7385779630f1c37d8a2a5178b8bf89fc664") - version("0.1.9", sha256="196eb9155a5ca6e35d0cc514e0609cf352fc757088707306653496b83a311ac1") depends_on("neo4j@5.17.0", type=("build", "run")) depends_on("redis@7.4.0", type=("build", "run")) - depends_on("python@3.8.3:3.13.0", when="@0.1.10:", type=("build", "run")) - depends_on("python@3.8.3:3.12.2", when="@:0.1.9", type=("build", "run")) + depends_on("python@3.8.3:3.13.0", type=("build", "run")) depends_on("py-poetry@0.12:", type="build") depends_on("py-flask@2.0:", type=("build", "run")) @@ -43,13 +43,11 @@ class HpcBeeflow(PythonPackage): depends_on("py-neo4j@5:", type=("build", "run")) depends_on("py-pyyaml@6.0.1:", type=("build", "run")) depends_on("py-flask-restful@0.3.9", type=("build", "run")) - depends_on("py-cwl-utils@0.16:", type=("build", "run")) + depends_on("py-cwl-utils@0.16", type=("build", "run")) depends_on("py-apscheduler@3.6.3:", type=("build", "run")) depends_on("py-jsonpickle@2.2.0:", type=("build", "run")) - depends_on("py-requests@:2.28", when="@:0.1.9", type=("build", "run")) - depends_on("py-requests@2.32.3:", when="@0.1.10:", type=("build", "run")) - depends_on("py-requests-unixsocket@0.3.0:", when="@:0.1.9", type=("build", "run")) - depends_on("py-requests-unixsocket@0.4.1:", when="@0.1.10:", type=("build", "run")) + depends_on("py-requests@2.32.3:", type=("build", "run")) + depends_on("py-requests-unixsocket@0.4.1:", type=("build", "run")) depends_on("py-python-daemon@2.3.1:", type=("build", "run")) depends_on("py-gunicorn@20.1.0:22", type=("build", "run")) depends_on("py-typer@0.5.0", type=("build", "run")) @@ -57,10 +55,11 @@ class HpcBeeflow(PythonPackage): depends_on("py-celery+redis+sqlalchemy@5.3.4:", type=("build", "run")) depends_on("py-docutils@0.18.1", type=("build", "run")) depends_on("py-graphviz@0.20.3:", type=("build", "run")) - depends_on("py-networkx@3.1", when="@0.1.10:", type=("build", "run")) - depends_on("py-pre-commit@3.5.0", when="@0.1.10:", type=("build", "run")) + depends_on("py-networkx@3.1", type=("build", "run")) + depends_on("py-pre-commit@3.5.0", type=("build", "run")) depends_on("py-mypy-extensions", type=("build", "run")) + # Setup for when "no containers" is specified def setup_run_environment(self, env): neo4j_bin = join_path(self.spec["neo4j"].prefix, "packaging/standalone/target") diff --git a/var/spack/repos/spack_repo/builtin/packages/py_cwl_utils/package.py b/var/spack/repos/spack_repo/builtin/packages/py_cwl_utils/package.py index 656ea0b3b67..314f0cab88d 100644 --- a/var/spack/repos/spack_repo/builtin/packages/py_cwl_utils/package.py +++ b/var/spack/repos/spack_repo/builtin/packages/py_cwl_utils/package.py @@ -20,6 +20,7 @@ class PyCwlUtils(PythonPackage): version("0.37", sha256="7b69c948f8593fdf44b44852bd8ef94c666736ce0ac12cf6e66e2a72ad16a773") version("0.21", sha256="583f05010f7572f3a69310325472ccb6efc2db7f43dc6428d03552e0ffcbaaf9") + version("0.16", sha256="38182e6dd12b039601ac2f72911b3d93ca4e37efca3b0165ffe162abab3edf7b") depends_on("python@3.6:", type=("build", "run")) depends_on("python@3.8:", when="@0.29:", type=("build", "run"))