flux: update to latest releases (#21306)

2 files changed, 34 insertions, 44 deletions

diff --git a/var/spack/repos/builtin/packages/flux-core/package.py b/var/spack/repos/builtin/packages/flux-core/package.py
index 715f69306b..e0abfb0c6f 100644
--- a/var/spack/repos/builtin/packages/flux-core/package.py
+++ b/var/spack/repos/builtin/packages/flux-core/package.py
@@ -13,8 +13,11 @@ class FluxCore(AutotoolsPackage):
     homepage = "https://github.com/flux-framework/flux-core"
     url      = "https://github.com/flux-framework/flux-core/releases/download/v0.8.0/flux-core-0.8.0.tar.gz"
     git      = "https://github.com/flux-framework/flux-core.git"
+    maintainers = ['SteVwonder']
 
     version('master', branch='master')
+    version('0.23.0', sha256='918b181be4e27c32f02d5036230212cd9235dc78dc2bde249c3651d6f75866c7')
+    version('0.22.0', sha256='1dd0b737199b8a40f245e6a4e1b3b28770f0ecf2f483d284232080b8b252521f')
     version('0.21.0', sha256='cc1b7a46d7c1c1a3e99e8861bba0dde89a97351eabd6f1b264788bd76e64c329')
     version('0.20.0', sha256='2970b9b1c389fc4a381f9e605921ce0eb6aa9339387ea741978bcffb4bd81b6f')
     version('0.19.0', sha256='f45328a37d989c308c46639a9ed771f47b11184422cf5604249919fbd320d6f5')
@@ -22,13 +25,6 @@ class FluxCore(AutotoolsPackage):
     version('0.17.0', sha256='3f8c6cb72982028f86a96c0098cacd3a6e9de359fa1cf077380c835a20e7b7f7')
     version('0.16.0', sha256='1582f7fb4d2313127418c34de7c9ce4f5fef00622d19cedca7bed929f4709f10')
     version('0.15.0', sha256='51bc2eae69501f802459fc82f191eb5e8ae0b4f7e9e77ac18543a850cc8445f5')
-    version('0.11.3', sha256='91b5d7dca8fc28a77777c4e4cb8717fc3dc2c174e70611740689a71901c6de7e')
-    version('0.11.2', sha256='ab8637428cd9b74b2dff4842d10e0fc4acc8213c4e51f31d32a4cbfbdf730412')
-    version('0.11.1', sha256='3c8495db0f3b701f6dfe3e2a75aed794fc561e9f28284e8c02ac67693bfe890e')
-    version('0.11.0', sha256='a4d8ff92e79b4ca19d556395bb8c5f8dc02fd9d5a8cc38c4a2c66867a96de5ea')
-    version('0.10.0', sha256='a70cdd228077af60c9443a5c69d3da932e447dd11697f5fef9028c48dabb3041')
-    version('0.9.0',  sha256='7b5b4aa72704b3c4432136b9e515e0d663568e6dbfc3ecd2f91c83b65841104e')
-    version('0.8.0',  sha256='eb4b0fe0da191acd3823ef42d415c40aae6a0c3aef62ebb27905658d045e11cc')
 
     # Avoid the infinite symlink issue
     # This workaround is documented in PR #3543
@@ -38,38 +34,26 @@ class FluxCore(AutotoolsPackage):
     variant('cuda', default=False, description='Build dependencies with support for CUDA')
 
     depends_on("libzmq@4.0.4:")
-    depends_on("czmq")
-    depends_on("czmq@2.2:3.99", when="@0.1:0.6")
-    depends_on("czmq@3.0.1:", when="@0.7:")
+    depends_on("czmq@3.0.1:")
     depends_on("hwloc@1.11.1:1.99", when="@:0.17.0")
     depends_on("hwloc@1.11.1:", when="@0.17.0:")
     depends_on("hwloc +cuda", when='+cuda')
     # Provide version hints for lua so that the concretizer succeeds when no
     # explicit flux-core version is given. See issue #10000 for details
-    depends_on("lua@5.1:5.2.99", type=('build', 'run', 'link'))
-    depends_on("lua@5.1:5.1.99", when="@0.1.0:0.9.0")
-    depends_on("lua@5.1:5.2.99", when="@0.10.0:,master")
+    depends_on("lua", type=('build', 'run', 'link'))
+    depends_on("lua@5.1:5.2.99", when="@:0.17.0")
+    depends_on("lua@5.1:5.3.99", when="@0.18.0:,master")
     depends_on("lua-luaposix")
-    depends_on("munge", when="@0.1.0:0.10.0")
     # `link` dependency on python due to Flux's `pymod` module
-    depends_on("python", type=('build', 'run', 'link'))
-    depends_on("python@2.7:2.99",
-               when="@0.1.0:0.11.0",
-               type=('build', 'run', 'link'))
-    depends_on("python@2.7:", when="@0.11.1:", type=('build', 'run', 'link'))
-    depends_on("python@3.6:", when="@0.17.0:,master", type=('build', 'run', 'link'))
+    depends_on("python@3.6:", type=('build', 'run', 'link'))
     depends_on("py-cffi", type=('build', 'run'))
-    depends_on("py-six", type=('build', 'run'), when="@0.11.0:")
-    depends_on("py-pyyaml", type=('build', 'run'), when="@0.11.0:")
-    depends_on("py-jsonschema", type=('build', 'run'), when="@0.12.0:")
+    depends_on("py-six", type=('build', 'run'))
+    depends_on("py-pyyaml")
+    depends_on("py-jsonschema")
     depends_on("jansson")
     depends_on("pkgconfig")
-    depends_on("yaml-cpp", when="@:0.11")
-    depends_on("lz4", when="@0.11.0:")
-
-    # versions up to 0.8.0 uses pylint to check Flux's python binding
-    # later versions provide a configure flag and disable the check by default
-    depends_on("py-pylint", when='@:0.8.0', type='build')
+    depends_on("yaml-cpp")
+    depends_on("lz4")
 
     depends_on("asciidoc", type='build', when="+docs")
 
@@ -81,7 +65,7 @@ class FluxCore(AutotoolsPackage):
     # Testing Dependencies
     depends_on("mpich pmi=pmi", type="test")
     depends_on("valgrind", type="test")
-    depends_on("jq", type="test", when='@0.12.0:')
+    depends_on("jq", type="test")
 
     def url_for_version(self, version):
         '''
@@ -182,3 +166,14 @@ class FluxCore(AutotoolsPackage):
         if '+docs' not in self.spec:
             args.append('--disable-docs')
         return args
+
+    def flag_handler(self, name, flags):
+        if name == 'cflags':
+            # https://github.com/flux-framework/flux-core/issues/3482
+            if self.spec.satisfies('%gcc@10:') and \
+               self.spec.satisfies('@0.23.0:0.23.99'):
+                if flags is None:
+                    flags = []
+                flags.append('-Wno-error=stringop-truncation')
+
+        return (flags, None, None)
diff --git a/var/spack/repos/builtin/packages/flux-sched/package.py b/var/spack/repos/builtin/packages/flux-sched/package.py
index 3e29b89545..b7b6f24f9f 100644
--- a/var/spack/repos/builtin/packages/flux-sched/package.py
+++ b/var/spack/repos/builtin/packages/flux-sched/package.py
@@ -13,19 +13,17 @@ class FluxSched(AutotoolsPackage):
     homepage = "https://github.com/flux-framework/flux-sched"
     url      = "https://github.com/flux-framework/flux-sched/releases/download/v0.5.0/flux-sched-0.5.0.tar.gz"
     git      = "https://github.com/flux-framework/flux-sched.git"
+    maintainers = ['SteVwonder']
 
     version('master', branch='master')
+    version('0.15.0', sha256='ff24d26997f91af415f98734b8117291f5a5001e86dac865b56b3d72980c80c8')
+    version('0.14.0', sha256='2808f42032b917823d69cd26103c9238694416e2f30c6d39c11c670927ed232a')
     version('0.13.0', sha256='ba17fc0451239fe31a1524b6a270741873f59a5057514d2524fd3e9215c47a82')
     version('0.12.0', sha256='b41ecaebba254abfb5a7995fd9100bd45a59d4ad0a79bdca8b3db02785d97b1d')
     version('0.11.0', sha256='6a0e3c0678f85da8724e5399b02be9686311c835617f6036235ef54b489cc336')
     version('0.10.0', sha256='5944927774709b5f52ddf64a0e825d9b0f24c9dea890b5504b87a8576d217cf6')
     version('0.9.0',  sha256='0e1eb408a937c2843bdaaed915d4d7e2ea763b98c31e7b849a96a74758d66a21')
     version('0.8.0', sha256='45bc3cefb453d19c0cb289f03692fba600a39045846568d258e4b896ca19ca0d')
-    version('0.7.1', sha256='a35e555a353feed6b7b814ae83d05362356f9ee33ffa75d7dfb7e2fe86c21294')
-    version('0.7.0', sha256='69267a3aaacaedd9896fd90cfe17aef266cba4fb28c77f8123d95a31ce739a7b')
-    version('0.6.0', sha256='3301d4c10810414228e5969b84b75fe1285abb97453070eb5a77f386d8184f8d')
-    version('0.5.0', sha256='d6347f5c85c12c76364dccb39d63c007094ca9cbbbae4e8f4e98d8b1c0b07e89')
-    version('0.4.0', sha256='00768a0b062aec42aa9b31d9d7006efd3a3e9cb9c24878d50487643c8af15e8a')
 
     # Avoid the infinite symlink issue
     # This workaround is documented in PR #3543
@@ -33,21 +31,18 @@ class FluxSched(AutotoolsPackage):
 
     variant('cuda', default=False, description='Build dependencies with support for CUDA')
 
-    depends_on("boost+graph@1.53.0,1.59.0:", when='@0.5.0:')
-    depends_on("py-pyyaml", when="@0.7.0:")
-    depends_on("libxml2@2.9.1:", when="@0.6.0")
-    depends_on("yaml-cpp", when="@0.7.0:")
+    depends_on("boost+graph@1.53.0,1.59.0:")
+    depends_on("py-pyyaml")
+    depends_on("libxml2@2.9.1:")
+    depends_on("yaml-cpp")
     depends_on("uuid")
     depends_on("pkgconfig")
 
     depends_on("flux-core", type=('build', 'link', 'run'))
     depends_on("flux-core+cuda", when='+cuda', type=('build', 'run', 'link'))
-    depends_on("flux-core@0.8.0", when='@0.4.0', type=('build', 'run', 'link'))
-    depends_on("flux-core@0.9.0", when='@0.5.0', type=('build', 'run', 'link'))
-    depends_on("flux-core@0.10.0", when='@0.6.0', type=('build', 'run', 'link'))
-    depends_on("flux-core@0.11.0", when='@0.7.0', type=('build', 'run', 'link'))
-    depends_on("flux-core@0.11.2:0.11.99", when='@0.7.1', type=('build', 'run', 'link'))
     depends_on("flux-core@0.16.0:0.16.99", when='@0.8.0', type=('build', 'run', 'link'))
+    depends_on("flux-core@0.22.0", when='@0.14.0', type=('build', 'run', 'link'))
+    depends_on("flux-core@0.23.0", when='@0.15.0', type=('build', 'run', 'link'))
     depends_on("flux-core@master", when='@master', type=('build', 'run', 'link'))
 
     # Need autotools when building on master: