hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add flux-core@0.11.0 and flux-sched@0.7.0 (#10447)

Browse source 
* flux-core: add v0.11.0 and updated dependencies

libuuid hasn't been a direct dependency of flux-core since 2015 (well
before any of the versions listed in the package).

The yaml-cpp dependency moved to flux-sched when we moved the jobpsec
library from core to sched.

Some python3 incompatibilities were found in 0.11.0, so bump the python3
support back a version.

* flux-sched: add v0.7.0 and make boost dependency more precise
This commit is contained in:
Stephen Herbein 2019-01-28 20:20:01 -08:00 committed by Todd Gamblin
parent 6535eae5c7
commit 67a1e56e4d
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/flux-core/package.py
View file

@ -15,6 +15,7 @@ class FluxCore(AutotoolsPackage):
git = "https://github.com/flux-framework/flux-core.git" git = "https://github.com/flux-framework/flux-core.git"
version('master', branch='master') version('master', branch='master')
version('0.11.0', sha256='a4d8ff92e79b4ca19d556395bb8c5f8dc02fd9d5a8cc38c4a2c66867a96de5ea')
version('0.10.0', 'a84a1ed53a69c805c253bc940540cbf667a059b2008fd2a6a9bb890a985ead08e88dcbba68c01567f887357306fbfded41b93cc33edfa7809955ba5ba5870284') version('0.10.0', 'a84a1ed53a69c805c253bc940540cbf667a059b2008fd2a6a9bb890a985ead08e88dcbba68c01567f887357306fbfded41b93cc33edfa7809955ba5ba5870284')
version('0.9.0', '70eaec1005aa49e8d8cf397570789cebedfb5d917efe963390d456ee4c473eefb15b0c81ea83f60a1fd057fe7be356bbafdebcae64b499844d194c48f6aefa05') version('0.9.0', '70eaec1005aa49e8d8cf397570789cebedfb5d917efe963390d456ee4c473eefb15b0c81ea83f60a1fd057fe7be356bbafdebcae64b499844d194c48f6aefa05')
version('0.8.0', 'b0fec05acedc530bcdf75b2477ac22f39d2adddc7af8ff76496208a5e1e8185b1b4a18677871d95c3cfbf34b05f391953651200917fe029931f4e2beb79d70df') version('0.8.0', 'b0fec05acedc530bcdf75b2477ac22f39d2adddc7af8ff76496208a5e1e8185b1b4a18677871d95c3cfbf34b05f391953651200917fe029931f4e2beb79d70df')
@ -39,14 +40,15 @@ class FluxCore(AutotoolsPackage):
depends_on("lua@5.1:5.2.99", when="@0.10.0:,master") depends_on("lua@5.1:5.2.99", when="@0.10.0:,master")
depends_on("lua-luaposix") depends_on("lua-luaposix")
depends_on("munge", when="@0.1.0:0.10.0") depends_on("munge", when="@0.1.0:0.10.0")
depends_on("libuuid")
depends_on("python", type=('build', 'run')) depends_on("python", type=('build', 'run'))
depends_on("python@2.7:2.99", when="@0.1.0:0.10.0") depends_on("python@2.7:2.99", when="@0.1.0:0.11.0")
depends_on("python@2.7:", when="@0.11.0:,master") depends_on("python@2.7:", when="@0.11.1:,master")
depends_on("py-cffi", type=('build', 'run')) depends_on("py-cffi", type=('build', 'run'))
depends_on("py-six", type=('build', 'run'), when="@0.11.0:,master") depends_on("py-six", type=('build', 'run'), when="@0.11.0:,master")
depends_on("py-pyyaml", type=('build', 'run'), when="@0.11.0:,master")
depends_on("py-jsonschema", type=('build', 'run'), when="@master")
depends_on("jansson") depends_on("jansson")
depends_on("yaml-cpp") depends_on("yaml-cpp", when="@:0.11.0")
depends_on("lz4", when="@0.11.0:,master") depends_on("lz4", when="@0.11.0:,master")
# versions up to 0.8.0 uses pylint to check Flux's python binding # versions up to 0.8.0 uses pylint to check Flux's python binding

6
var/spack/repos/builtin/packages/flux-sched/package.py
View file

@ -15,6 +15,7 @@ class FluxSched(AutotoolsPackage):
git = "https://github.com/flux-framework/flux-sched.git" git = "https://github.com/flux-framework/flux-sched.git"
version('master', branch='master') version('master', branch='master')
version('0.7.0', sha256='69267a3aaacaedd9896fd90cfe17aef266cba4fb28c77f8123d95a31ce739a7b')
version('0.6.0', '8aad185949038c7fb6b277e6a8282947917084ebbec5c5bf0ee3a81a0dcdbe41ba18b1df837c669ae7b48ca5f1e492a5172bffa6b9feb4dda1c6a7a85abed4e8') version('0.6.0', '8aad185949038c7fb6b277e6a8282947917084ebbec5c5bf0ee3a81a0dcdbe41ba18b1df837c669ae7b48ca5f1e492a5172bffa6b9feb4dda1c6a7a85abed4e8')
version('0.5.0', 'a9835c9c478aa41123a4e12672500052228aaf1ea770f74cb0901dbf4a049bd7d329e99d8d3484e39cfed1f911705030b2775dcfede39bc8bea59c6afe2549b1') version('0.5.0', 'a9835c9c478aa41123a4e12672500052228aaf1ea770f74cb0901dbf4a049bd7d329e99d8d3484e39cfed1f911705030b2775dcfede39bc8bea59c6afe2549b1')
version('0.4.0', '82732641ac4594ffe9b94ca442a99e92bf5f91bc14745af92203a887a40610dd44edda3ae07f9b6c8d63799b2968d87c8da28f1488edef1310d0d12be9bd6319') version('0.4.0', '82732641ac4594ffe9b94ca442a99e92bf5f91bc14745af92203a887a40610dd44edda3ae07f9b6c8d63799b2968d87c8da28f1488edef1310d0d12be9bd6319')
@ -25,15 +26,18 @@ class FluxSched(AutotoolsPackage):
variant('cuda', default=False, description='Build dependencies with support for CUDA') variant('cuda', default=False, description='Build dependencies with support for CUDA')
depends_on("boost+graph", when='@0.5.0:,master') depends_on("boost+graph@1.53.0,1.59.0:", when='@0.5.0:,master')
depends_on("py-pyyaml", when="@0.7.0:,master") depends_on("py-pyyaml", when="@0.7.0:,master")
depends_on("libxml2@2.9.1:", when="@0.6.0,master") depends_on("libxml2@2.9.1:", when="@0.6.0,master")
depends_on("yaml-cpp", when="@0.7.0:")
depends_on("libuuid")
depends_on("flux-core", type=('build', 'link', 'run')) depends_on("flux-core", type=('build', 'link', 'run'))
depends_on("flux-core+cuda", when='+cuda') depends_on("flux-core+cuda", when='+cuda')
depends_on("flux-core@0.8.0", when='@0.4.0') depends_on("flux-core@0.8.0", when='@0.4.0')
depends_on("flux-core@0.9.0", when='@0.5.0') depends_on("flux-core@0.9.0", when='@0.5.0')
depends_on("flux-core@0.10.0", when='@0.6.0') depends_on("flux-core@0.10.0", when='@0.6.0')
depends_on("flux-core@0.11.0", when='@0.7.0')
depends_on("flux-core@master", when='@master') depends_on("flux-core@master", when='@master')
# Need autotools when building on master: # Need autotools when building on master: