diff --git a/var/spack/repos/builtin/packages/hpc-beeflow/package.py b/var/spack/repos/builtin/packages/hpc-beeflow/package.py index ca5de3e5a7f..8e822a86f28 100644 --- a/var/spack/repos/builtin/packages/hpc-beeflow/package.py +++ b/var/spack/repos/builtin/packages/hpc-beeflow/package.py @@ -17,15 +17,20 @@ class HpcBeeflow(PythonPackage): specified to run on.""" homepage = "https://github.com/lanl/bee" - pypi = "hpc_beeflow/hpc_beeflow-0.1.9.tar.gz" + pypi = "hpc_beeflow/hpc_beeflow-0.1.10.tar.gz" - # maintainers("pagrubel") + maintainers("pagrubel") license("MIT") + version("0.1.10", sha256="b7863798e15591a16f6cd265f9b5b7385779630f1c37d8a2a5178b8bf89fc664") version("0.1.9", sha256="196eb9155a5ca6e35d0cc514e0609cf352fc757088707306653496b83a311ac1") - depends_on("python@3.8.3:3.12.2", type=("build", "run")) + 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("py-poetry@0.12:", type="build") depends_on("py-flask@2.0:", type=("build", "run")) @@ -37,12 +42,28 @@ class HpcBeeflow(PythonPackage): 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", type=("build", "run")) - depends_on("py-requests-unixsocket@0.3.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-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")) + depends_on("py-typer@0.5.0", type=("build", "run")) depends_on("py-cffi@1.15.1:", type=("build", "run")) 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-mypy-extensions", type=("build", "run")) + + def setup_run_environment(self, env): + + neo4j_bin = join_path(self.spec["neo4j"].prefix, "packaging/standalone/target") + redis_bin = join_path(self.spec["redis"].prefix, "bin") + + env.prepend_path("PATH", neo4j_bin) + env.prepend_path("PATH", redis_bin) + + env.set("neo4j_path", neo4j_bin) + env.set("redis_path", redis_bin) diff --git a/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py b/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py index 7dc2d74341f..26391c33d3a 100644 --- a/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py +++ b/var/spack/repos/builtin/packages/py-requests-unixsocket/package.py @@ -13,10 +13,21 @@ class PyRequestsUnixsocket(PythonPackage): license("Apache-2.0") + version("0.4.1", sha256="b2596158c356ecee68d27ba469a52211230ac6fb0cde8b66afb19f0ed47a1995") version("0.3.0", sha256="28304283ea9357d45fff58ad5b11e47708cfbf5806817aa59b2a363228ee971e") version("0.2.0", sha256="9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea") - depends_on("py-setuptools", type="build") - depends_on("py-pbr", type="build") + depends_on("py-setuptools", when="@:0.3.0", type="build") + depends_on("py-setuptools@64:", when="@0.4:", type="build") + depends_on("py-setuptools-scm@8:", when="@0.4:", type="build") + depends_on("python@3.9:", when="@0.4:", type=("build", "run")) depends_on("py-requests@1.1:", type=("build", "run")) depends_on("py-urllib3@1.8:", when="@:0.2.0", type=("build", "run")) + + def url_for_version(self, version): + url = "https://files.pythonhosted.org/packages/source/r/requests-unixsocket/requests{}unixsocket-{}.tar.gz" + if version >= Version("0.3.1"): + sep = "_" + else: + sep = "-" + return url.format(sep, version)