Skip to content

Commit d6a9511

Browse files
authored
py-cylc-flow package: update package and dependents/dependencies
* Add [email protected] (needed for [email protected]). * Add [email protected] and enable png output when creating graphs by requesting variant pangocairo for graphviz dependency. * Add corresponding versions of [email protected], [email protected], [email protected]. * Add myself as maintainer to all the cylc-related packages.
1 parent dd69b64 commit d6a9511

File tree

5 files changed

+47
-13
lines changed

5 files changed

+47
-13
lines changed

var/spack/repos/builtin/packages/py-cylc-flow/package.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,20 @@ class PyCylcFlow(PythonPackage):
1010

1111
homepage = "https://cylc.org"
1212
pypi = "cylc-flow/cylc-flow-8.1.4.tar.gz"
13+
git = "https://github.com/cylc/cylc-flow.git"
1314

1415
maintainers("LydDeb", "climbfuji")
1516

1617
license("GPL-3.0-only")
1718

19+
# Version 8.3.6 is available at PyPI, but not at the URL that is considered canonical by Spack
20+
# https://github.com/spack/spack/issues/48479
21+
version("8.3.6", commit="7f63b43164638e27636b992b14b3fa088b692b94")
1822
version("8.2.3", sha256="dd5bea9e4b8dad00edd9c3459a38fb778e5a073da58ad2725bc9b84ad718e073")
1923
version("8.2.0", sha256="cbe35e0d72d1ca36f28a4cebe9b9040a3445a74253bc94051a3c906cf179ded0")
2024
version("8.1.4", sha256="d1835ac18f6f24f3115c56b2bc821185484e834a86b12fd0033ff7e4dc3c1f63")
2125

22-
depends_on("py-setuptools@49:66,68:", type=("build", "run"))
26+
depends_on("py-setuptools@49:66,68:", type=("build", "run"), when="@:8.2")
2327
depends_on("[email protected]", type=("build", "run"), when="@:8.1")
2428
depends_on("[email protected]:", type=("build", "run"))
2529
depends_on("[email protected]:", type=("build", "run"))
@@ -28,15 +32,20 @@ class PyCylcFlow(PythonPackage):
2832
depends_on("[email protected]", type=("build", "run"))
2933
depends_on("[email protected]", type=("build", "run"), when="@:8.2.0")
3034
depends_on("py-metomi-isodatetime@3:3.1", type=("build", "run"), when="@8.2.3:")
31-
depends_on("[email protected]:4.21", type=("build", "run"))
35+
depends_on("py-packaging", type=("build", "run"), when="@8.3:")
36+
depends_on("[email protected]:4.21", type=("build", "run"), when="@:8.2")
37+
depends_on("[email protected]:4.24", type=("build", "run"), when="@8.3:")
3238
depends_on("[email protected]:", type=("build", "run"))
3339
depends_on("py-pyzmq@22:", type=("build", "run"), when="@8.2:")
3440
depends_on("py-pyzmq@22", type=("build", "run"), when="@:8.1")
35-
depends_on("py-importlib-metadata", type=("build", "run"), when="^python@:3.7")
36-
depends_on("py-urwid@2", type=("build", "run"))
41+
depends_on("py-importlib-metadata", type=("build", "run"), when="@:8.2 ^python@:3.7")
42+
depends_on("py-importlib-metadata@5:", type=("build", "run"), when="@8.3: ^python@:3.11")
43+
depends_on("py-urwid@2:2.6.1,2.6.4:2", type=("build", "run"))
3744
depends_on("py-rx", type=("build", "run"))
3845
depends_on("py-promise", type=("build", "run"))
3946
depends_on("py-tomli@2:", type=("build", "run"), when="^python@:3.10")
4047

41-
# Non-Python dependencies
42-
depends_on("graphviz", type="run")
48+
# Non-Python dependencies for creating graphs.
49+
# We want at least the pangocairo variant for
50+
# graphviz so that we can create output as png.
51+
depends_on("graphviz+pangocairo", type="run")

var/spack/repos/builtin/packages/py-cylc-rose/package.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,26 @@ class PyCylcRose(PythonPackage):
1010

1111
homepage = "https://cylc.github.io/cylc-doc/latest/html/plugins/cylc-rose.html"
1212
pypi = "cylc-rose/cylc-rose-1.3.0.tar.gz"
13+
git = "https://github.com/cylc/cylc-rose.git"
1314

14-
maintainers("LydDeb")
15+
maintainers("LydDeb", "climbfuji")
1516

1617
license("GPL-3.0-only")
1718

19+
# Version 1.4.2 is available at PyPI, but not at the URL that is considered canonical by Spack
20+
# https://github.com/spack/spack/issues/48479
21+
version("1.4.2", commit="8deda0480afed8cf92cfdf7938fc78d0aaf0c0e4")
1822
version("1.3.0", sha256="017072b69d7a50fa6d309a911d2428743b07c095f308529b36b1b787ebe7ab88")
1923

2024
depends_on("py-setuptools", type="build")
21-
depends_on("[email protected]", type=("build", "run"))
22-
depends_on("[email protected]", type=("build", "run"))
2325
depends_on("py-metomi-isodatetime", type=("build", "run"))
2426
depends_on("py-jinja2", type=("build", "run"))
27+
28+
with when("@1.3.0"):
29+
depends_on("[email protected]", type=("build", "run"))
30+
depends_on("[email protected]", type=("build", "run"))
31+
32+
with when("@1.4.2"):
33+
depends_on("[email protected]", type=("build", "run"))
34+
depends_on("[email protected]:8.3", type=("build", "run"))
35+
depends_on("py-ansimarkup", type=("build", "run"))

var/spack/repos/builtin/packages/py-cylc-uiserver/package.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,31 @@ class PyCylcUiserver(PythonPackage):
1010

1111
homepage = "https://github.com/cylc/cylc-uiserver/"
1212
pypi = "cylc-uiserver/cylc-uiserver-1.3.0.tar.gz"
13+
git = "https://github.com/cylc/cylc-uiserver.git"
1314

14-
maintainers("LydDeb")
15+
maintainers("LydDeb", "climbfuji")
1516

1617
license("GPL-3.0-or-later")
1718

19+
# Version 1.5.1 is available at PyPI, but not at the URL that is considered canonical by Spack
20+
# https://github.com/spack/spack/issues/48479
21+
version("1.5.1", commit="3a41c6fbefbcea33c41410f3698de8b62c9871b8")
1822
version("1.3.0", sha256="f3526e470c7ac2b61bf69e9b8d17fc7a513392219d28baed9b1166dcc7033d7a")
1923

24+
depends_on("[email protected]:", when="@1.5.1", type=("build", "run"))
2025
depends_on("py-wheel", type="build")
2126
depends_on("[email protected]:", type="build")
22-
depends_on("[email protected]", type=("build", "run"))
27+
28+
depends_on("[email protected]", when="@1.3.0", type=("build", "run"))
29+
depends_on("[email protected]", when="@1.5.1", type=("build", "run"))
2330
depends_on("[email protected]:", type=("build", "run"))
2431
depends_on("py-graphene", type=("build", "run"))
2532
depends_on("[email protected]", type=("build", "run"))
2633
depends_on("[email protected]", type=("build", "run"))
27-
depends_on("[email protected]:1", type=("build", "run"))
34+
depends_on("[email protected]:1", when="@1.3.0", type=("build", "run"))
35+
depends_on("[email protected]:", when="@1.5.1", type=("build", "run"))
2836
depends_on("py-requests", type=("build", "run"))
37+
depends_on("py-psutil", when="@1.5.1", type=("build", "run"))
2938
depends_on("[email protected]:", type=("build", "run"))
3039
depends_on("[email protected]:", type=("build", "run"))
3140
depends_on("py-pyzmq", type=("build", "run"))

var/spack/repos/builtin/packages/py-metomi-rose/package.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ class PyMetomiRose(PythonPackage):
1111
homepage = "https://metomi.github.io/rose/doc/html/index.html"
1212
pypi = "metomi-rose/metomi-rose-2.1.0.tar.gz"
1313

14-
maintainers("LydDeb")
14+
maintainers("LydDeb", "climbfuji")
1515

1616
license("GPL-3.0-only")
1717

18+
version("2.3.2", sha256="5d2a1593a5bbe8362fbe5e197eaa0cde2574700c62181d9b5c1fafa1e67656cd")
1819
version("2.1.0", sha256="1b60135a434fe4325d364a57e8f5e81e90f39b373b9d68733458c1adc2513c05")
1920

2021
depends_on("fortran", type="build") # generated
@@ -28,3 +29,6 @@ class PyMetomiRose(PythonPackage):
2829
depends_on("[email protected]:", type=("build", "run"))
2930
depends_on("py-requests", type=("build", "run"))
3031
depends_on("py-sqlalchemy@1", type=("build", "run"))
32+
33+
depends_on("py-importlib-metadata@5:", when="@2.3.2 ^python@:3.11")
34+
depends_on("py-importlib-resources@2:", when="@2.3.2 ^python@:3.8")

var/spack/repos/builtin/packages/py-protobuf/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class PyProtobuf(PythonPackage):
2020
version("5.27.5", sha256="7fa81bc550201144a32f4478659da06e0b2ebe4d5303aacce9a202a1c3d5178d")
2121
version("5.26.1", sha256="8ca2a1d97c290ec7b16e4e5dff2e5ae150cc1582f55b5ab300d45cb0dfa90e51")
2222
version("4.25.3", sha256="25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c")
23+
version("4.24.4", sha256="5a70731910cd9104762161719c3d883c960151eea077134458503723b60e3667")
2324
version("4.24.3", sha256="12e9ad2ec079b833176d2921be2cb24281fa591f0b119b208b788adc48c2561d")
2425
version("4.23.3", sha256="7a92beb30600332a52cdadbedb40d33fd7c8a0d7f549c440347bc606fb3fe34b")
2526
version("4.21.9", sha256="61f21493d96d2a77f9ca84fefa105872550ab5ef71d21c458eb80edcf4885a99")

0 commit comments

Comments
 (0)