Skip to content
Snippets Groups Projects
Commit 65acfc96 authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

Merge branch 'spack_v0.21.1_fix_py-ray' into 'spack_v0.21.1'

chore(py-ray): add comments

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!490
parents d86c095c f8801fb0
No related branches found
No related tags found
2 merge requests!495update to Spack v0.21.1,!490chore(py-ray): add comments
Pipeline #27583 failed with stage
in 2 hours, 49 minutes, and 26 seconds
...@@ -13,14 +13,37 @@ class PyRay(PythonPackage): ...@@ -13,14 +13,37 @@ class PyRay(PythonPackage):
homepage = "https://github.com/ray-project/ray" homepage = "https://github.com/ray-project/ray"
url = "https://github.com/ray-project/ray/archive/ray-0.8.7.tar.gz" url = "https://github.com/ray-project/ray/archive/ray-0.8.7.tar.gz"
# begin EBRAINS (added): ECM new node-js -> new react whatever -> new py-ray
version("2.4.0", sha256="b0110a84630b2f6d10cd13e8ac955875c3658373eb6cabcc77cf316de3c28066")
# end EBRAINS
version("2.0.1", sha256="b8b2f0a99d2ac4c001ff11c78b4521b217e2a02df95fb6270fd621412143f28b") version("2.0.1", sha256="b8b2f0a99d2ac4c001ff11c78b4521b217e2a02df95fb6270fd621412143f28b")
version("0.8.7", sha256="2df328f1bcd3eeb4fa33119142ea0d669396f4ab2a3e78db90178757aa61534b") version("0.8.7", sha256="2df328f1bcd3eeb4fa33119142ea0d669396f4ab2a3e78db90178757aa61534b")
variant("default", default=False, description="Install default extras", when="@2.0.1") variant("default", default=False, description="Install default extras", when="@2.0.1")
# begin EBRAINS (added): ECM new node-js -> new react whatever -> new py-ray
conflicts("node-js@17:", when="@:2.0.1")
# end EBRAINS
# begin EBRAINS (added): ElM add missing dependencies/constraints for added version 2.4.0
depends_on("python@3.6:3.11", when="@2.4.0", type=("build", "run"))
depends_on("bazel@5", when="@2.4.0", type="build")
depends_on("py-cython@0.29.32:", when="@2.4.0", type="build")
depends_on("py-attrs", when="@2.4.0", type=("build", "run"))
depends_on("py-click@7.0:", when="@2.4.0", type=("build", "run"))
depends_on("py-grpcio@1.32:1.51.3", when="@2.4.0 ^python@:3.9", type=("build", "run"))
depends_on("py-grpcio@1.42:1.51.3", when="@2.4.0 ^python@3.10:", type=("build", "run"))
depends_on("py-protobuf@3.15.3:", when="@2.4.0", type=("build", "run"))
depends_on("py-frozenlist", when="@2.4.0", type=("build", "run"))
depends_on("py-typing-extensions", when="@2.4.0 ^python@:3.7", type=("build", "run"))
depends_on("py-virtualenv@20.0.24:", when="@2.4.0", type=("build", "run"))
# end EBRAINS
depends_on("python@3.6:3.10", when="@2.0.1", type=("build", "run")) depends_on("python@3.6:3.10", when="@2.0.1", type=("build", "run"))
depends_on("python@3.6:3.8", when="@0.8.7", type=("build", "run")) depends_on("python@3.6:3.8", when="@0.8.7", type=("build", "run"))
# begin EBRAINS (modified): ECM relax constraint to allow newer bazel
depends_on("bazel@4.2.2:5", when="@2.0.1", type="build") depends_on("bazel@4.2.2:5", when="@2.0.1", type="build")
# end EBRAINS (modified)
depends_on("bazel@3.2.0", when="@0.8.7", type="build") depends_on("bazel@3.2.0", when="@0.8.7", type="build")
depends_on("npm", type="build") depends_on("npm", type="build")
depends_on("py-setuptools", type="build") depends_on("py-setuptools", type="build")
...@@ -45,11 +68,12 @@ class PyRay(PythonPackage): ...@@ -45,11 +68,12 @@ class PyRay(PythonPackage):
depends_on("py-typing-extensions", when="@2.0.1 ^python@:3.7", type=("build", "run")) depends_on("py-typing-extensions", when="@2.0.1 ^python@:3.7", type=("build", "run"))
depends_on("py-virtualenv", when="@2.0.1", type=("build", "run")) depends_on("py-virtualenv", when="@2.0.1", type=("build", "run"))
# needed to fix import errors # begin EBRAINS (added): ElM needed to fix import errors
depends_on("py-setproctitle", type=("build", "run")) depends_on("py-setproctitle", type=("build", "run"))
depends_on("py-colorama", type=("build", "run")) depends_on("py-colorama", type=("build", "run"))
depends_on("py-psutil", type=("build", "run")) depends_on("py-psutil", type=("build", "run"))
# end EBRAINS
with when("+default"): with when("+default"):
depends_on("py-aiohttp@3.7:", type=("build", "run")) depends_on("py-aiohttp@3.7:", type=("build", "run"))
depends_on("py-aiohttp-cors", type=("build", "run")) depends_on("py-aiohttp-cors", type=("build", "run"))
...@@ -100,4 +124,4 @@ class PyRay(PythonPackage): ...@@ -100,4 +124,4 @@ class PyRay(PythonPackage):
with working_dir(join_path("python", "ray", "dashboard", "client")): with working_dir(join_path("python", "ray", "dashboard", "client")):
npm = which("npm") npm = which("npm")
npm("ci") npm("ci")
npm("run", "build") npm("run", "build")
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment