Skip to content
Snippets Groups Projects
Unverified Commit d6a9511f authored by Dom Heinzeller's avatar Dom Heinzeller Committed by GitHub
Browse files

py-cylc-flow package: update package and dependents/dependencies 

* Add py-protobuf@4.24.4 (needed for py-cylc-flow@8.3.6).
* Add py-cylc-flow@8.3.6 and enable png output when creating graphs
  by requesting variant pangocairo for graphviz dependency.
* Add corresponding versions of py-metomi-rose@2.3.2,
  py-cylc-rose@1.4.2, py-cylc-uiserver@1.4.2.
* Add myself as maintainer to all the cylc-related packages.
parent dd69b646
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
var/spack/repos/builtin/packages/py-cylc-flow/package.py
+ 15
− 6
View file @ d6a9511f
......@@ -10,16 +10,20 @@ class PyCylcFlow(PythonPackage):
homepage = "https://cylc.org"
pypi = "cylc-flow/cylc-flow-8.1.4.tar.gz"
git = "https://github.com/cylc/cylc-flow.git"
maintainers("LydDeb", "climbfuji")
license("GPL-3.0-only")
# Version 8.3.6 is available at PyPI, but not at the URL that is considered canonical by Spack
# https://github.com/spack/spack/issues/48479
version("8.3.6", commit="7f63b43164638e27636b992b14b3fa088b692b94")
version("8.2.3", sha256="dd5bea9e4b8dad00edd9c3459a38fb778e5a073da58ad2725bc9b84ad718e073")
version("8.2.0", sha256="cbe35e0d72d1ca36f28a4cebe9b9040a3445a74253bc94051a3c906cf179ded0")
version("8.1.4", sha256="d1835ac18f6f24f3115c56b2bc821185484e834a86b12fd0033ff7e4dc3c1f63")
depends_on("py-setuptools@49:66,68:", type=("build", "run"))
depends_on("py-setuptools@49:66,68:", type=("build", "run"), when="@:8.2")
depends_on("py-aiofiles@0.7", type=("build", "run"), when="@:8.1")
depends_on("py-ansimarkup@1.0.0:", type=("build", "run"))
depends_on("py-async-timeout@3.0.0:", type=("build", "run"))
......@@ -28,15 +32,20 @@ class PyCylcFlow(PythonPackage):
depends_on("py-jinja2@3.0", type=("build", "run"))
depends_on("py-metomi-isodatetime@3.0", type=("build", "run"), when="@:8.2.0")
depends_on("py-metomi-isodatetime@3:3.1", type=("build", "run"), when="@8.2.3:")
depends_on("py-protobuf@4.21.2:4.21", type=("build", "run"))
depends_on("py-packaging", type=("build", "run"), when="@8.3:")
depends_on("py-protobuf@4.21.2:4.21", type=("build", "run"), when="@:8.2")
depends_on("py-protobuf@4.24.4:4.24", type=("build", "run"), when="@8.3:")
depends_on("py-psutil@5.6.0:", type=("build", "run"))
depends_on("py-pyzmq@22:", type=("build", "run"), when="@8.2:")
depends_on("py-pyzmq@22", type=("build", "run"), when="@:8.1")
depends_on("py-importlib-metadata", type=("build", "run"), when="^python@:3.7")
depends_on("py-urwid@2", type=("build", "run"))
depends_on("py-importlib-metadata", type=("build", "run"), when="@:8.2 ^python@:3.7")
depends_on("py-importlib-metadata@5:", type=("build", "run"), when="@8.3: ^python@:3.11")
depends_on("py-urwid@2:2.6.1,2.6.4:2", type=("build", "run"))
depends_on("py-rx", type=("build", "run"))
depends_on("py-promise", type=("build", "run"))
depends_on("py-tomli@2:", type=("build", "run"), when="^python@:3.10")
# Non-Python dependencies
depends_on("graphviz", type="run")
# Non-Python dependencies for creating graphs.
# We want at least the pangocairo variant for
# graphviz so that we can create output as png.
depends_on("graphviz+pangocairo", type="run")
var/spack/repos/builtin/packages/py-cylc-rose/package.py
+ 14
− 3
View file @ d6a9511f
......@@ -10,15 +10,26 @@ class PyCylcRose(PythonPackage):
homepage = "https://cylc.github.io/cylc-doc/latest/html/plugins/cylc-rose.html"
pypi = "cylc-rose/cylc-rose-1.3.0.tar.gz"
git = "https://github.com/cylc/cylc-rose.git"
maintainers("LydDeb")
maintainers("LydDeb", "climbfuji")
license("GPL-3.0-only")
# Version 1.4.2 is available at PyPI, but not at the URL that is considered canonical by Spack
# https://github.com/spack/spack/issues/48479
version("1.4.2", commit="8deda0480afed8cf92cfdf7938fc78d0aaf0c0e4")
version("1.3.0", sha256="017072b69d7a50fa6d309a911d2428743b07c095f308529b36b1b787ebe7ab88")
depends_on("py-setuptools", type="build")
depends_on("py-metomi-rose@2.1", type=("build", "run"))
depends_on("py-cylc-flow@8.2", type=("build", "run"))
depends_on("py-metomi-isodatetime", type=("build", "run"))
depends_on("py-jinja2", type=("build", "run"))
with when("@1.3.0"):
depends_on("py-metomi-rose@2.1", type=("build", "run"))
depends_on("py-cylc-flow@8.2", type=("build", "run"))
with when("@1.4.2"):
depends_on("py-metomi-rose@2.3", type=("build", "run"))
depends_on("py-cylc-flow@8.3.5:8.3", type=("build", "run"))
depends_on("py-ansimarkup", type=("build", "run"))
var/spack/repos/builtin/packages/py-cylc-uiserver/package.py
+ 12
− 3
View file @ d6a9511f
......@@ -10,22 +10,31 @@ class PyCylcUiserver(PythonPackage):
homepage = "https://github.com/cylc/cylc-uiserver/"
pypi = "cylc-uiserver/cylc-uiserver-1.3.0.tar.gz"
git = "https://github.com/cylc/cylc-uiserver.git"
maintainers("LydDeb")
maintainers("LydDeb", "climbfuji")
license("GPL-3.0-or-later")
# Version 1.5.1 is available at PyPI, but not at the URL that is considered canonical by Spack
# https://github.com/spack/spack/issues/48479
version("1.5.1", commit="3a41c6fbefbcea33c41410f3698de8b62c9871b8")
version("1.3.0", sha256="f3526e470c7ac2b61bf69e9b8d17fc7a513392219d28baed9b1166dcc7033d7a")
depends_on("python@3.8:", when="@1.5.1", type=("build", "run"))
depends_on("py-wheel", type="build")
depends_on("py-setuptools@40.9.0:", type="build")
depends_on("py-cylc-flow@8.2", type=("build", "run"))
depends_on("py-cylc-flow@8.2", when="@1.3.0", type=("build", "run"))
depends_on("py-cylc-flow@8.3", when="@1.5.1", type=("build", "run"))
depends_on("py-ansimarkup@1.0.0:", type=("build", "run"))
depends_on("py-graphene", type=("build", "run"))
depends_on("py-graphene-tornado@2.6", type=("build", "run"))
depends_on("py-graphql-ws@0.4.4", type=("build", "run"))
depends_on("py-jupyter-server@1.10.2:1", type=("build", "run"))
depends_on("py-jupyter-server@1.10.2:1", when="@1.3.0", type=("build", "run"))
depends_on("py-jupyter-server@2.7:", when="@1.5.1", type=("build", "run"))
depends_on("py-requests", type=("build", "run"))
depends_on("py-psutil", when="@1.5.1", type=("build", "run"))
depends_on("py-tornado@6.1.0:", type=("build", "run"))
depends_on("py-traitlets@5.2.1:", type=("build", "run"))
depends_on("py-pyzmq", type=("build", "run"))
......
var/spack/repos/builtin/packages/py-metomi-rose/package.py
+ 5
− 1
View file @ d6a9511f
......@@ -11,10 +11,11 @@ class PyMetomiRose(PythonPackage):
homepage = "https://metomi.github.io/rose/doc/html/index.html"
pypi = "metomi-rose/metomi-rose-2.1.0.tar.gz"
maintainers("LydDeb")
maintainers("LydDeb", "climbfuji")
license("GPL-3.0-only")
version("2.3.2", sha256="5d2a1593a5bbe8362fbe5e197eaa0cde2574700c62181d9b5c1fafa1e67656cd")
version("2.1.0", sha256="1b60135a434fe4325d364a57e8f5e81e90f39b373b9d68733458c1adc2513c05")
depends_on("fortran", type="build") # generated
......@@ -28,3 +29,6 @@ class PyMetomiRose(PythonPackage):
depends_on("py-psutil@5.6.0:", type=("build", "run"))
depends_on("py-requests", type=("build", "run"))
depends_on("py-sqlalchemy@1", type=("build", "run"))
depends_on("py-importlib-metadata@5:", when="@2.3.2 ^python@:3.11")
depends_on("py-importlib-resources@2:", when="@2.3.2 ^python@:3.8")
var/spack/repos/builtin/packages/py-protobuf/package.py
+ 1
− 0
View file @ d6a9511f
......@@ -20,6 +20,7 @@ class PyProtobuf(PythonPackage):
version("5.27.5", sha256="7fa81bc550201144a32f4478659da06e0b2ebe4d5303aacce9a202a1c3d5178d")
version("5.26.1", sha256="8ca2a1d97c290ec7b16e4e5dff2e5ae150cc1582f55b5ab300d45cb0dfa90e51")
version("4.25.3", sha256="25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c")
version("4.24.4", sha256="5a70731910cd9104762161719c3d883c960151eea077134458503723b60e3667")
version("4.24.3", sha256="12e9ad2ec079b833176d2921be2cb24281fa591f0b119b208b788adc48c2561d")
version("4.23.3", sha256="7a92beb30600332a52cdadbedb40d33fd7c8a0d7f549c440347bc606fb3fe34b")
version("4.21.9", sha256="61f21493d96d2a77f9ca84fefa105872550ab5ef71d21c458eb80edcf4885a99")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment