From 7dbc4d32db439063eba4859facbc4b4b759cf50c Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Tue, 5 Jan 2021 23:36:56 -0800 Subject: update stat and deps with bug fixes (#20690) --- .../repos/builtin/packages/fast-global-file-status/package.py | 6 +++++- var/spack/repos/builtin/packages/graphlib/package.py | 1 + var/spack/repos/builtin/packages/launchmon/package.py | 1 + .../repos/builtin/packages/mount-point-attributes/package.py | 3 +++ var/spack/repos/builtin/packages/py-xdot/package.py | 3 +++ var/spack/repos/builtin/packages/stat/package.py | 9 ++++++--- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/fast-global-file-status/package.py b/var/spack/repos/builtin/packages/fast-global-file-status/package.py index f08cf9990a..13a2187094 100644 --- a/var/spack/repos/builtin/packages/fast-global-file-status/package.py +++ b/var/spack/repos/builtin/packages/fast-global-file-status/package.py @@ -12,11 +12,15 @@ class FastGlobalFileStatus(AutotoolsPackage): homepage = "https://github.com/LLNL/FastGlobalFileStatus" url = 'https://github.com/LLNL/FastGlobalFileStatus/files/2271592/fastglobalfilestatus-1.1.tar.gz' + git = "https://github.com/LLNL/FastGlobalFileStatus.git" + maintainers = ['lee218llnl'] + version('master', branch='master') version('1.1', sha256='e6fba4a0b7f055899fa0e05d93a435c7f1f2ec1158b9a6647dc8d2bcf9c2e164') depends_on('mrnet') - depends_on('mount-point-attributes') + # we depend on mpa@master for bug fixes since mpa 1.1 + depends_on('mount-point-attributes@master') depends_on('mpi') depends_on('openssl') depends_on('elf') diff --git a/var/spack/repos/builtin/packages/graphlib/package.py b/var/spack/repos/builtin/packages/graphlib/package.py index 7e8313a871..bd09fd1901 100644 --- a/var/spack/repos/builtin/packages/graphlib/package.py +++ b/var/spack/repos/builtin/packages/graphlib/package.py @@ -10,6 +10,7 @@ class Graphlib(CMakePackage): """Library to create, manipulate, and export graphs Graphlib.""" homepage = "https://github.com/LLNL/graphlib" url = "https://github.com/LLNL/graphlib/archive/v2.0.0.tar.gz" + maintainers = ['lee218llnl'] version('2.0.0', sha256='4f4aa1193167c41c8491dec3cf22b1e52a8f0842faab88b7945972f02d2adbcd') version('3.0.0', sha256='c3d889f7bc25b9662426605e52f14cd16f9c05b034738a343890707f5f5681f1') diff --git a/var/spack/repos/builtin/packages/launchmon/package.py b/var/spack/repos/builtin/packages/launchmon/package.py index 9f4e0915e6..19342d47a4 100644 --- a/var/spack/repos/builtin/packages/launchmon/package.py +++ b/var/spack/repos/builtin/packages/launchmon/package.py @@ -12,6 +12,7 @@ class Launchmon(AutotoolsPackage): homepage = "https://github.com/LLNL/LaunchMON" url = "https://github.com/LLNL/LaunchMON/releases/download/v1.0.2/launchmon-v1.0.2.tar.gz" git = "https://github.com/llnl/launchmon.git" + maintainers = ['lee218llnl'] version('master', branch='master') version('1.0.2', sha256='1d301ccccfe0873efcd66da87ed5e4d7bafc560b00aee396d8a9365f53b3a33a') diff --git a/var/spack/repos/builtin/packages/mount-point-attributes/package.py b/var/spack/repos/builtin/packages/mount-point-attributes/package.py index c4abcbde67..74bf697faa 100644 --- a/var/spack/repos/builtin/packages/mount-point-attributes/package.py +++ b/var/spack/repos/builtin/packages/mount-point-attributes/package.py @@ -12,7 +12,10 @@ class MountPointAttributes(AutotoolsPackage): homepage = "https://github.com/LLNL/MountPointAttributes" url = 'https://github.com/LLNL/MountPointAttributes/files/2270601/mountpointattr-1.1.tar.gz' + git = "https://github.com/LLNL/MountPointAttributes.git" + maintainers = ['lee218llnl'] + version('master', branch='master') version('1.1', sha256='bff84c75c47b74ea09b6cff949dd699b185ddba0463cb1ff39ab138003c96e02') depends_on('autoconf', type='build') diff --git a/var/spack/repos/builtin/packages/py-xdot/package.py b/var/spack/repos/builtin/packages/py-xdot/package.py index d38a36d740..12d448eeea 100644 --- a/var/spack/repos/builtin/packages/py-xdot/package.py +++ b/var/spack/repos/builtin/packages/py-xdot/package.py @@ -13,8 +13,10 @@ class PyXdot(PythonPackage): homepage = "https://github.com/jrfonseca/xdot.py" pypi = "xdot/xdot-1.0.tar.gz" git = "https://github.com/jrfonseca/xdot.py.git" + maintainers = ['lee218llnl'] version('master', branch='master') + version('1.2', sha256='3df91e6c671869bd2a6b2a8883fa3476dbe2ba763bd2a7646cf848a9eba71b70') version('1.0', sha256='7e067896d729af82f1fd0758e265f129944d469c30f550e3f15dbdb751cc42a1') version('0.9', sha256='a33701664ecfefe7c7313a120a587e87334f3a566409bc451538fcde5edd6907') @@ -28,6 +30,7 @@ class PyXdot(PythonPackage): depends_on('atk', type=('build', 'run')) depends_on('gdk-pixbuf', type=('build', 'run')) depends_on('gtkplus', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'run'), when='@1.2:') @run_after('install') def post_install(self): diff --git a/var/spack/repos/builtin/packages/stat/package.py b/var/spack/repos/builtin/packages/stat/package.py index c7a6a2fbd4..1e68f58809 100644 --- a/var/spack/repos/builtin/packages/stat/package.py +++ b/var/spack/repos/builtin/packages/stat/package.py @@ -12,6 +12,7 @@ class Stat(AutotoolsPackage): homepage = "http://paradyn.org/STAT/STAT.html" url = "https://github.com/LLNL/STAT/archive/v2.0.0.tar.gz" git = "https://github.com/llnl/stat.git" + maintainers = ['lee218llnl'] version('develop', branch='develop') version('4.0.2', sha256='9ece10dde8e1579c9db469ac8d2391b26e59498c0947dbb271c2d01d7ef0a65d', @@ -39,16 +40,18 @@ class Stat(AutotoolsPackage): depends_on('dyninst', when='~dysect') depends_on('dyninst@:9.99', when='@:4.0.1') depends_on('dyninst@8.2.1+stat_dysect', when='+dysect') - depends_on('fast-global-file-status', when='+fgfs') + # we depend on fgfs@master to avoid seg faults with fgfs 1.1 + depends_on('fast-global-file-status@master', when='+fgfs') depends_on('graphlib@2.0.0', when='@2.0.0:2.2.0') depends_on('graphlib@3.0.0', when='@3:') depends_on('graphviz', type=('build', 'link', 'run')) - depends_on('launchmon') + # we depend on mpa@master for bug fixes since launchmon 1.0.2 + depends_on('launchmon@master') depends_on('mrnet') depends_on('python@:2.8', when='@:4.0.0') depends_on('py-pygtk', type=('build', 'run'), when='@:4.0.0') depends_on('py-enum34', type=('run'), when='@:4.0.0') - depends_on('py-xdot', when='@4.0.1:') + depends_on('py-xdot@1.0', when='@4.0.1:') depends_on('swig') depends_on('mpi', when='+examples') depends_on('boost') -- cgit v1.2.3-70-g09d2