diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2020-03-04 19:24:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-04 19:24:16 -0600 |
| commit | b813887585d62744b979e0613e25f612b8796080 (patch) | |
| tree | ce0e14c5840f5ad3857f112c73f6035f2a3ccf71 | |
| parent | 136a4897b781c186ad70364bc4ab6b9421b90ddb (diff) | |
| download | spack-b813887585d62744b979e0613e25f612b8796080.tar.gz spack-b813887585d62744b979e0613e25f612b8796080.tar.bz2 spack-b813887585d62744b979e0613e25f612b8796080.tar.xz spack-b813887585d62744b979e0613e25f612b8796080.zip | |
ADIOS2: Cleanup, Development Branch Name (#15334)
* ADIOS2: Version `master`
Rename branch version to supported, real development branch `master`.
The old name is legacy Spack when alternative development branch
names were not yet supported.
* ADIOS: Simplify via spec Variable
use the already defined local variable `spec` to shorten
lines
| -rw-r--r-- | var/spack/repos/builtin/packages/adios2/package.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py index 87bdce078a..9d298b4213 100644 --- a/var/spack/repos/builtin/packages/adios2/package.py +++ b/var/spack/repos/builtin/packages/adios2/package.py @@ -16,7 +16,7 @@ class Adios2(CMakePackage): maintainers = ['ax3l', 'chuckatkins', 'williamfgc'] - version('develop', branch='master') + version('master', branch='master') version('2.5.0', sha256='7c8ff3bf5441dd662806df9650c56a669359cb0185ea232ecb3578de7b065329') version('2.4.0', sha256='50ecea04b1e41c88835b4b3fd4e7bf0a0a2a3129855c9cc4ba6cf6a1575106e2') version('2.3.1', sha256='3bf81ccc20a7f2715935349336a76ba4c8402355e1dc3848fcd6f4c3c5931893') @@ -149,7 +149,7 @@ class Adios2(CMakePackage): 'ON' if self.run_tests else 'OFF'), ] - if self.spec.version >= Version('2.4.0'): + if spec.version >= Version('2.4.0'): args.append('-DADIOS2_USE_Blosc={0}'.format( 'ON' if '+blosc' in spec else 'OFF')) args.append('-DADIOS2_USE_BZip2={0}'.format( @@ -159,7 +159,7 @@ class Adios2(CMakePackage): args.append('-DADIOS2_USE_SSC={0}'.format( 'ON' if '+ssc' in spec else 'OFF')) - if self.spec.version >= Version('2.5.0'): + if spec.version >= Version('2.5.0'): args.append('-DADIOS2_USE_DataSpaces={0}'.format( 'ON' if '+dataspaces' in spec else 'OFF')) @@ -181,6 +181,6 @@ class Adios2(CMakePackage): if spec.satisfies('+python') or self.run_tests: args.append('-DPYTHON_EXECUTABLE:FILEPATH=%s' - % self.spec['python'].command.path) + % spec['python'].command.path) return args |